diff options
| author | Łukasz Stelmach <l.stelmach@samsung.com> | 2014-01-15 13:17:08 +0100 |
|---|---|---|
| committer | Łukasz Stelmach <l.stelmach@samsung.com> | 2014-01-15 13:17:08 +0100 |
| commit | 90b2de102fe4c773f9d6ba2da2065f254a5803b6 (patch) | |
| tree | e1fa3d099d6e8eeafd3dd0eef243b8d2f41a0b9b /po | |
| parent | 20c6d7ec2c817aa561410130efc8c8254fbef2b2 (diff) | |
| download | diffutils-90b2de102fe4c773f9d6ba2da2065f254a5803b6.tar.gz diffutils-90b2de102fe4c773f9d6ba2da2065f254a5803b6.tar.bz2 diffutils-90b2de102fe4c773f9d6ba2da2065f254a5803b6.zip | |
Imported Upstream version 3.3upstream/3.3
Diffstat (limited to 'po')
| -rw-r--r-- | po/LINGUAS | 1 | ||||
| -rw-r--r-- | po/Makefile.in.in | 58 | ||||
| -rw-r--r-- | po/Makevars | 14 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | po/Rules-quot | 4 | ||||
| -rw-r--r-- | po/ca.gmo | bin | 10062 -> 8086 bytes | |||
| -rw-r--r-- | po/ca.po | 598 | ||||
| -rw-r--r-- | po/cs.gmo | bin | 14120 -> 11937 bytes | |||
| -rw-r--r-- | po/cs.po | 546 | ||||
| -rw-r--r-- | po/da.gmo | bin | 13370 -> 33006 bytes | |||
| -rw-r--r-- | po/da.po | 962 | ||||
| -rw-r--r-- | po/de.gmo | bin | 7734 -> 34323 bytes | |||
| -rw-r--r-- | po/de.po | 1281 | ||||
| -rw-r--r-- | po/diffutils.pot | 381 | ||||
| -rw-r--r-- | po/el.gmo | bin | 12462 -> 10040 bytes | |||
| -rw-r--r-- | po/el.po | 592 | ||||
| -rw-r--r-- | po/eo.gmo | bin | 9427 -> 7621 bytes | |||
| -rw-r--r-- | po/eo.po | 584 | ||||
| -rw-r--r-- | po/es.gmo | bin | 34492 -> 35234 bytes | |||
| -rw-r--r-- | po/es.po | 447 | ||||
| -rw-r--r-- | po/fi.gmo | bin | 9925 -> 8015 bytes | |||
| -rw-r--r-- | po/fi.po | 592 | ||||
| -rw-r--r-- | po/fr.gmo | bin | 34563 -> 35421 bytes | |||
| -rw-r--r-- | po/fr.po | 431 | ||||
| -rw-r--r-- | po/ga.gmo | bin | 9741 -> 7832 bytes | |||
| -rw-r--r-- | po/ga.po | 590 | ||||
| -rw-r--r-- | po/gl.gmo | bin | 8466 -> 11832 bytes | |||
| -rw-r--r-- | po/gl.po | 1185 | ||||
| -rw-r--r-- | po/he.gmo | bin | 7906 -> 6214 bytes | |||
| -rw-r--r-- | po/he.po | 600 | ||||
| -rw-r--r-- | po/hr.gmo | bin | 0 -> 16501 bytes | |||
| -rw-r--r-- | po/hr.po | 1307 | ||||
| -rw-r--r-- | po/hu.gmo | bin | 9720 -> 7832 bytes | |||
| -rw-r--r-- | po/hu.po | 596 | ||||
| -rw-r--r-- | po/id.gmo | bin | 13336 -> 11236 bytes | |||
| -rw-r--r-- | po/id.po | 545 | ||||
| -rw-r--r-- | po/it.gmo | bin | 13579 -> 30640 bytes | |||
| -rw-r--r-- | po/it.po | 1075 | ||||
| -rw-r--r-- | po/ja.gmo | bin | 15087 -> 32697 bytes | |||
| -rw-r--r-- | po/ja.po | 1016 | ||||
| -rw-r--r-- | po/lv.gmo | bin | 13871 -> 11739 bytes | |||
| -rw-r--r-- | po/lv.po | 553 | ||||
| -rw-r--r-- | po/ms.gmo | bin | 9588 -> 7775 bytes | |||
| -rw-r--r-- | po/ms.po | 587 | ||||
| -rw-r--r-- | po/nl.gmo | bin | 34107 -> 34911 bytes | |||
| -rw-r--r-- | po/nl.po | 406 | ||||
| -rw-r--r-- | po/pl.gmo | bin | 33175 -> 33964 bytes | |||
| -rw-r--r-- | po/pl.po | 447 | ||||
| -rw-r--r-- | po/pt_BR.gmo | bin | 8588 -> 6754 bytes | |||
| -rw-r--r-- | po/pt_BR.po | 621 | ||||
| -rw-r--r-- | po/ro.gmo | bin | 8383 -> 6584 bytes | |||
| -rw-r--r-- | po/ro.po | 630 | ||||
| -rw-r--r-- | po/ru.gmo | bin | 9820 -> 7949 bytes | |||
| -rw-r--r-- | po/ru.po | 598 | ||||
| -rw-r--r-- | po/sr.gmo | bin | 11966 -> 9609 bytes | |||
| -rw-r--r-- | po/sr.po | 582 | ||||
| -rw-r--r-- | po/sv.gmo | bin | 31890 -> 32740 bytes | |||
| -rw-r--r-- | po/sv.po | 449 | ||||
| -rw-r--r-- | po/tr.gmo | bin | 9954 -> 34231 bytes | |||
| -rw-r--r-- | po/tr.po | 1066 | ||||
| -rw-r--r-- | po/uk.gmo | bin | 42177 -> 43183 bytes | |||
| -rw-r--r-- | po/uk.po | 442 | ||||
| -rw-r--r-- | po/vi.gmo | bin | 15593 -> 36884 bytes | |||
| -rw-r--r-- | po/vi.po | 1101 | ||||
| -rw-r--r-- | po/zh_CN.gmo | bin | 9391 -> 7519 bytes | |||
| -rw-r--r-- | po/zh_CN.po | 577 | ||||
| -rw-r--r-- | po/zh_TW.gmo | bin | 9651 -> 7761 bytes | |||
| -rw-r--r-- | po/zh_TW.po | 579 |
68 files changed, 10420 insertions, 11625 deletions
@@ -10,6 +10,7 @@ fr ga gl he +hr hu id it diff --git a/po/Makefile.in.in b/po/Makefile.in.in index be0ca59..fce63a6 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,7 +1,5 @@ -# -*- buffer-read-only: t -*- vi: set ro: -# DO NOT EDIT! GENERATED AUTOMATICALLY! # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu> +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -10,8 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.17 -GETTEXT_MACRO_VERSION = 0.17 +# Origin: gettext-0.18.2 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -90,22 +88,22 @@ CATALOGS = @CATALOGS@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -125,6 +123,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -139,8 +138,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ package_gnu='GNU '; \ else \ package_gnu=''; \ @@ -195,8 +202,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -219,7 +233,6 @@ install-data: install-data-@USE_NLS@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -271,7 +284,6 @@ installdirs-data: installdirs-data-@USE_NLS@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -397,9 +409,15 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -420,9 +438,13 @@ $(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff --git a/po/Makevars b/po/Makevars index 3a6203f..25d84bf 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,5 +1,3 @@ -# -*- buffer-read-only: t -*- vi: set ro: -# DO NOT EDIT! GENERATED AUTOMATICALLY! # Makefile variables for PO directory in any package using GNU gettext. # Usually the message domain is the same as the package name. @@ -52,3 +50,15 @@ MSGID_BUGS_ADDRESS = bug-diffutils@gnu.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = diff --git a/po/POTFILES.in b/po/POTFILES.in index c829fcb..b6764e6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of files that contain translatable strings. -# Copyright (C) 2001-2002, 2009-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/po/Rules-quot b/po/Rules-quot index 9c2a995..d2ac20d 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -14,13 +14,13 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-04-21 13:33+0200\n" "Last-Translator: Ernest Adrogu Calveras <eadrogue@gmx.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -24,7 +24,7 @@ msgstr "error del programa" msgid "stack overflow" msgstr "desbordament de pila" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Error no identificat del sistema" @@ -137,101 +137,103 @@ msgstr "%s: l'opci %s requereix arguments\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Succs" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Cap resultat" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "L'expressi regular no s vlida" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "El carcter de collaci no s vlid" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "El nom de la classe de carcter no s vlid" # al final o al principi? eac -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Hi ha una barra invertida al final" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Hi ha una referncia cap enrera no vlida" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Hi ha un signe [ o ^[ desaparellat" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Hi ha un signe ( o \\( desaparellat" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Hi ha un signe \\{ desaparellat" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "El contingut de \\{\\} no s vlid" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "El lmit superior de l'interval no vlid" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memria exhaurida" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "L'expressi regular precedent no s vlida" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Final prematur de l'expressi regular" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "L'expressi regular s massa gran" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Hi ha un signe ) o \\) desaparellat" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "No hi ha cap expressi regular prvia" @@ -263,17 +265,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "el valor %s per l'opci --bytes no s vlid" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "el nombre de lnies d'horitz %s no s vlid" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -441,7 +443,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Els fitxers %s i %s difereixen\n" @@ -451,7 +453,7 @@ msgstr "Els fitxers %s i %s difereixen\n" msgid "Binary files %s and %s differ\n" msgstr "Els fitxers %s i %s difereixen\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "No hi ha cap carcter de salt de lnia al final del fitxer" @@ -465,14 +467,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Proveu %s --help per obtenir ms informaci." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "el valor %s per l'opci --ignore-initial no s vlid" #: src/cmp.c:147 @@ -480,14 +482,14 @@ msgstr "el valor %s per l'opci --ignore-initial no s vlid" msgid "options -l and -s are incompatible" msgstr "les opcions -l i -s sn incompatibles" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "error d'escriptura" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "sortida estndard" @@ -550,7 +552,7 @@ msgid "" msgstr "" "SALT1 i SALT2 sn el nombre d'octets que es passen per alt de cada fitxer." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -566,28 +568,29 @@ msgstr "" "1.000.000.000, G per 1.073.741.824, i aix amb T, P, E, Z i Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Si un FITXER s - o falta, llegeix l'entrada estndard." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "L'estat de sortida s 0 si les entrades sn iguals, 1 si sn diferents\n" "i 2 en cas d'error." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "el valor %s per l'opci --bytes no s vlid" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "falta un operand desprs de %s" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "sobra l'operand %s" # mirar el comentari del codi font @@ -607,161 +610,158 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: final de fitxer a %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "el nombre de lnies de context %s no s vlid" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "aquest sistema no suporta paginaci" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "massa opcions d'etiqueta de fitxer" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "l'amplada %s no s vlida" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "opcions d'amplada incompatibles" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "el nombre de lnies d'horitz %s no s vlid" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "la distncia de tabulaci %s no s vlida" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "opcions de distncia de tabulaci incompatibles" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "heu especificat les opcions --from-file i --to-file al mateix temps" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Genera un diff normal." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Indica noms si els fitxers difereixen o no." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Avisa quan dos fitxers sn idntics." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NM --width=NM No ms de NM (130 per omissi) carcters per lnia." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w NM --width=NM No ms de NM (130 per omissi) carcters per lnia." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Tracta tots els fitxers com a text." +msgstr "-e --ed Genera un script ed." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Genera un diff en format RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Mostra la versi del programa." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NM --width=NM No ms de NM (130 per omissi) carcters per lnia." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "" "-l --left-column Noms escriu les lnies en com a la columna esquerra." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines No mostra les lnies en com." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Expandeix les tabulacions de la sortida a espais." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Alinea el text de cada lnia amb un carcter de tabulaci." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" @@ -769,36 +769,40 @@ msgstr "" "--tabsize=NM Estableix la distncia de tabulaci en NM (8 per omissi)\n" " carcters." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Pagina la sortida amb el programa pr." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Compara recursivament qualsevol subdirectori existent." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Considera els fitxers inexistents com si fssin buits." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Tracta els fitxers primers inexistents com si\n" " fssin buits." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" @@ -806,19 +810,19 @@ msgstr "" "en\n" " els noms dels fitxers." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case T en compte diferncies entre majscules i\n" " minscules en comparar noms de fitxers." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Exclou fitxers que coincideixen amb PAT." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -826,7 +830,7 @@ msgstr "" "-X FITXER --exclude-from=FITXER Exclou fitxers que coincideixen amb\n" " qualsevol patr de FITXER." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -834,7 +838,7 @@ msgstr "" "-S FITXER --starting-file=FITXER Comena per FITXER quan es comparen\n" " directoris." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -843,7 +847,7 @@ msgstr "" "--from-file=FITXER1 Compara FITXER1 amb tots els operands. FITXER1 pot ser\n" " un directori." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -852,105 +856,106 @@ msgstr "" "--to-file=FITXER1 Compara tots els operands amb FITXER2. FITXER2 pot ser\n" " un directori." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Ignora diferncies entre majscules i minscules." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignora canvis provocats per la distncia de\n" " tabulaci." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignora tot l'espai en blanc." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Ignora canvis en la quantitat d'espai en blanc." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignora tot l'espai en blanc." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Ignora canvis en lnies que estan en blanc." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I ER --ignore-matching-lines=ER Ignora canvis en lnies que continguin ER." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Tracta tots els fitxers com a text." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Treu els carcters finals de retorn de carro de " "l'entrada." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Escriu i llegeix dades en mode binari." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NOM --ifdef=NOM Genera un fitxer combinat amb diferncies expressades\n" " amb directives `#ifdef NOM'." # `grups' o `grups de lnies' (no queda prou clar) -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--TIPUSG-group-format=FMTG Similar, per formata els grups TIPUSG amb FMTG." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=FMTL Similar, per formata totes les lnies amb FMTL." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--TIPUSL-line-format=FMTL Similar, per formata les lnies TIPUSL amb FMTL." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " TIPUSL pot ser old (velles), new (noves), o " "unchanged (inalterades).\n" " TIPUSG pot ser qualsevol TIPUSL o b changed (alterades)." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -980,7 +985,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -994,7 +999,7 @@ msgstr "" " %[-][AMPLADA][.[PRECISI]]{doxX}n espec. estil printf pel nombre de " "lnia" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1008,17 +1013,17 @@ msgstr "" " %c'C' el carcter C\n" " %c'\\OOO' el carcter de codi octal OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Intenta trobar canvis mnims." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NM No descarta NM lnies amb prefix i sufix com." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1026,77 +1031,85 @@ msgstr "" "-H --speed-large-files Assumeix fitxers grans i molts canvis petits " "dispersos." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Mostra la versi del programa." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FITXERS s FITXER1 FITXER2 o DIR1 DIR2 o DIR FITXER... o FITXER... " "DIR." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Amb les opcions --from-file o --to-file no hi ha restriccions de FITXERS." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Si FITXER s -, llegeix l'entrada estndard." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Mode d's: %s [OPCI]... FITXERS\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Compara fitxers lnia per lnia." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "el valor %s per l'opci %s s conflictiu" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "opcions d'estil de sortida conflictives" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Noms a %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "no es pot comparar - amb un directori" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "l'opci -D no funciona amb directoris" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectoris comuns: %s i %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "El fitxer %s s un %s mentre que el fitxer %s s un %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Els fitxers %s i %s difereixen\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Els fitxers %s i %s sn idntics\n" @@ -1112,11 +1125,12 @@ msgid "incompatible options" msgstr "opcions incompatibles" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "heu especificat - per ms d'un fitxer d'entrada" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lectura fallida" @@ -1157,16 +1171,12 @@ msgid "" msgstr "-x --overlap-only Mostra els canvis solapats." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Mostra els canvis no comuns, senyalant els conflictes " -"amb\n" -" separadors." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Afegeix les instruccions w i q a l'script ed." #: src/diff3.c:438 @@ -1205,9 +1215,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Tracta tots els fitxers com a text." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1260,30 +1269,30 @@ msgstr "error intern: tipus de diff invlid en process_diff" msgid "invalid diff format; invalid change separator" msgstr "el format diff no s vlid: el separador de canvis no s vlid" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "el format diff no s vlid: l'ltima lnia est incompleta" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "no s'ha pogut invocar el programa subsidiari %s" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "el format diff no s vlid: carcters invlids al principi de lnia" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "error intern: tipus de diff no vlid passat a la sortida" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "el fitxer d'entrada s'ha encongit" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "no es poden comparar els noms de fitxer %s i %s" #: src/dir.c:209 @@ -1296,7 +1305,7 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" @@ -1304,78 +1313,84 @@ msgstr "" "-o FITXER --output=FITXER Opera interactivament, i envia la sortida a " "FITXER." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case No distingeix entre majscules i minscules." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignora canvis provocats per la distncia de\n" " tabulaci." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignora tot l'espai en blanc." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Ignora canvis en la quantitat d'espai en blanc." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignora tot l'espai en blanc." +msgstr "-W --ignore-all-space Ignora tot l'espai en blanc." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Ignora canvis en lnies que estan en blanc." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I ER --ignore-matching-lines=ER Ignora canvis en lnies que continguin ER." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Treu els carcters finals de retorn de carro de " "l'entrada." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Tracta tots els fitxers com a text." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NM --width=NM No ms de NM (130 per omissi) carcters per lnia." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l --left-column Noms escriu les lnies en com a la columna esquerra." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines No mostra les lnies en com." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Expandeix les tabulacions de la sortida a espais." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" @@ -1383,12 +1398,12 @@ msgstr "" "--tabsize=NM Estableix la distncia de tabulaci en NM (8 per omissi)\n" " carcters." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Intenta trobar canvis mnims." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1396,40 +1411,39 @@ msgstr "" "-H --speed-large-files Assumeix fitxers grans i molts canvis petits " "dispersos." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAMA Usa PROGRAMA per comparar fitxers." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Tracta tots els fitxers com a text." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Mostra la versi del programa." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Mode d's: %s [OPCI]... FITXER1 FITXER2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Combina diferncies entre fitxers en dues columnes" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "no es pot combinar interactivament l'entrada estndard" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "ambds fitxers sn directoris" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1454,6 +1468,20 @@ msgstr "" "v:\tInclou les lnies comunes i informa amb loquacitat\n" "q:\tSurt.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: opci illegal -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Aix s programari lliure; vegeu el codi font per les condicions de " +#~ "cpia. No\n" +#~ "hi ha CAP garantia, ni tan sols de COMERCIABILITAT o ADEQUACI A UN " +#~ "PROPSIT.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SALT1:SALT2 --ignore-initial=SALT1:SALT2" @@ -1461,55 +1489,24 @@ msgstr "" #~ msgstr "" #~ "-s --quiet --silent No mostra res; torna l'estat de sortida i prou." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Mostra la versi del programa." - #~ msgid "--help Output this help." #~ msgstr "--help Mostra aquesta ajuda." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Compara tres fitxers lnia per lnia." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignora canvis provocats per la distncia de\n" -#~ " tabulaci." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Ignora canvis en la quantitat d'espai en blanc." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignora tot l'espai en blanc." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Ignora canvis en lnies que estan en blanc." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Comuniqueu errors a <bug-gnu-utils@gnu.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Treu els carcters finals de retorn de carro de " -#~ "l'entrada." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "l'opci -%ld s obsoleta; useu -%c %ld" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Tracta tots els fitxers com a text." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "l'opci -%ld s obsoleta; eviteu-la" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1523,10 +1520,6 @@ msgstr "" #~ " -F ER --show-function-line=ER Mostra la lnia ms recent que " #~ "contingui ER." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Genera un script ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1539,40 +1532,12 @@ msgstr "" #~ " --left-column Noms mostra les lnies en com a la columna esquerra.\n" #~ " --suppress-common-lines No mostra les lnies en com." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t --expand-tabs Expandeix les tabulacions de la sortida a espais." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Alinea el text de cada lnia amb un carcter de " -#~ "tabulaci." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NM Estableix la distncia de tabulaci en NM (8 per " -#~ "omissi)\n" -#~ " carcters." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Intenta trobar canvis mnims." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Assumeix fitxers grans i molts canvis petits " #~ "dispersos." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Mostra tots els canvis, senyalant els conflictes amb " -#~ "separadors." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Mostra els canvis solapats, amb separadors." @@ -1586,79 +1551,6 @@ msgstr "" #~ msgstr "" #~ "-L ETIQUETA --label=ETIQUETA Usa ETIQUETA en lloc del nom del fitxer." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAMA Usa PROGRAMA per comparar fitxers." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignora tot l'espai en blanc." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NM --width=NM No ms de NM (130 per omissi) carcters per lnia." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Noms escriu les lnies en com a la columna esquerra." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Assumeix fitxers grans i molts canvis petits " -#~ "dispersos." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "lectura fallida" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "error d'escriptura" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "lectura fallida" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "lectura fallida" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "error d'escriptura" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "error d'escriptura" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: opci illegal -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Aix s programari lliure; vegeu el codi font per les condicions de " -#~ "cpia. No\n" -#~ "hi ha CAP garantia, ni tan sols de COMERCIABILITAT o ADEQUACI A UN " -#~ "PROPSIT.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Comuniqueu errors a <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "l'opci -%ld s obsoleta; useu -%c %ld" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "l'opci -%ld s obsoleta; eviteu-la" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "no s'ha trobat el programa subsidiari %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.0\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2010-05-04 17:21+0100\n" "Last-Translator: Petr Kočvara <petr.kocvara@nemfm.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -24,7 +24,7 @@ msgstr "chyba programu" msgid "stack overflow" msgstr "přetečení zásobníku" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Neznámá chyba systému" @@ -137,100 +137,102 @@ msgstr "%s: přepínač '-W %s' vyžaduje argument\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "„" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "“" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Hotovo" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Žádná shoda" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Neplatný regulární výraz" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Neplatný znak porovnání" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Neplatné jméno třídy znaků" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Koncové zpětné lomítko" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Neplatný zpětný odkaz" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Nepárová [ nebo ]^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Nepárová ( nebo \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Nepárová \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Neplatný obsah \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Neplatný konec rozsahu" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Paměť vyčerpána" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Neplatný předchozí regulární výraz" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Předčasný konec regulárního výrazu" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regulární výraz je příliš dlouhý" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Nepárová ) nebo \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Předchozí regulární výraz neexistuje" @@ -260,18 +262,18 @@ msgid "failed to reopen %s with mode %s" msgstr "nelze znovuotevřít %s v módu %s" #: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid %s%s argument '%s'" msgstr "neplatná hodnota %s%s přepínače `%s'" #: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid suffix in %s%s argument '%s'" msgstr "neplatná přípona v hodnotě %s%s přepínače `%s'" #: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument `%s' too large" +#, fuzzy, c-format +msgid "%s%s argument '%s' too large" msgstr "hodnota %s%s přepínače `%s' je příliš velká" #: lib/version-etc.c:74 @@ -453,7 +455,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Obecná pomoc při používání softwaru GNU:: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Soubory %s a %s jsou různé\n" @@ -463,7 +465,7 @@ msgstr "Soubory %s a %s jsou různé\n" msgid "Binary files %s and %s differ\n" msgstr "Binární soubory %s a %s jsou rozdílné\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Chybí znak konce řádku na konci souboru" @@ -477,14 +479,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Více informací získáte příkazem `%s --help'." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "neplatná hodnota --ignore-inital `%s'" #: src/cmp.c:147 @@ -492,14 +494,14 @@ msgstr "neplatná hodnota --ignore-inital `%s'" msgid "options -l and -s are incompatible" msgstr "přepínače -l a -s nejsou kompatibilní" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "zápis selhal" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standardní výstup" @@ -562,7 +564,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "N1 a N2 udávají počet bajtů, které budou ignorovány v každém souboru." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -578,29 +580,30 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, a stejně tak i pro T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "" "Pokud SOUBOR bude `-' nebo nebude existovat, bude čten standardní vstup." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Návratový kód je roven 0 pokud jsou vstupy shodné, 1 pokud se liší a 2 při " "chybě." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "neplatná hodnota přepínače --bytes `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "po `%s' je nesprávný operand" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "operand `%s' je nadbytečný" #: src/cmp.c:491 @@ -619,166 +622,163 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF v %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "neplatná délka kontextu `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "přestránkování není na tomto počítači podporováno" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "příliš mnoho přepínačů popisu souboru" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "nesprávná délka `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "konfliktní volby šířky výstupu" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "neplatná délka obzoru `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "nesprávná hodnota tabsize `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "konfliktní přepínače tabsize" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "parametry --from-file i to-file použity najednou" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Výstup bude v normálním diff formátu." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Výstup pouze při rozdílných souborech." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Uvede pouze shodné soubory." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w POČ --width=POČ Vypíše maximálně POČ (implicitně 130) znaků na řádek." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w POČ --width=POČ Vypíše maximálně POČ (implicitně 130) znaků na řádek." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Pokládá všechny soubory za text." +msgstr "-e --ed Vytvoří skript pro ed." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Výstup bude ve formátu RCS diff." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Informace o verzi." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w POČ --width=POČ Vypíše maximálně POČ (implicitně 130) znaků na řádek." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Vypíše pouze levý sloupec společných řádků." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nevypisuje shodné řádky." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Ve výstupu převede tabulátory na mezery." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Na začátek řádků se vloží tabulátor." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" "--tabsize=POČ Tab zastavuje každých POČ (implicitně 8) tiskových sloupců." -#: src/diff.c:871 +#: src/diff.c:874 #, fuzzy msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" @@ -786,46 +786,50 @@ msgstr "" "--suppress-blank-empty Potlačí mezeru nebo tabulátor před prázdnými\n" " řádky výstupu." -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Výstup projde přes `pr' pro přestránkování." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Rekurzívní porovnání všech nalezených podadresářů." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Neexistující soubory považuje za prázdné." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Při porovnávání adresářů považuje neexistující\n" " soubory v prvém adresáři za prázdné." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Ignoruje velikost písmen v názvech souborů." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Bere v potaz velikost písmen v názvech souborů." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x VZOR --exclude=VZOR Vynechá soubory odpovídající VZORu." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -833,7 +837,7 @@ msgstr "" "-X SOUBOR --exclude-from=SOUBOR Vynechá soubory, které odpovídají\n" " libovolnému vzorku ze SOUBORu." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -841,7 +845,7 @@ msgstr "" "-S SOUBOR --starting-file=SOUBOR Při porovnávání adresářů začne souborem\n" " SOUBOR." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -850,7 +854,7 @@ msgstr "" "--from-file=SOUBOR1 Porovná SOUBOR1 se všemi operandy. SOUBOR1 může být\n" " adresář." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -859,100 +863,101 @@ msgstr "" "--to-file=SOUBOR2 Porovná všechny operandy se SOUBOR2. SOUBOR2 může být\n" " adresář." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Ignoruje velikost písmen v obsahu souboru." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Ignoruje změny v odsazení tabelátorem." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignoruje všechny mezery." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignoruje změny v počtu mezer." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignoruje všechny mezery." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Ignoruje změny v případě prázdných řádků." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RV --ignore-matching-lines=RV Ignoruje změny na všech řádcích\n" " odpovídajících RV." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Pokládá všechny soubory za text." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Odstraní ukončovací znak CR na vstupu." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Čte a zapisuje data v binárním režimu." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D JMENO --ifdef=JMENO Vypíše sloučený soubor s rozdíly `#ifdef JMENO'." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=FMTS Podobné, ale formátuje vstupní skupiny GTYPE\n" " podle FMTS." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=FMTR Podobně, ale formátuje všechny vstupní řádky podle FMTR." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=FMTR Podobné, ale formátuje vstupní řádky LTYPE podle " "FMTR." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE je `starý', `nový' nebo `nezměněn'. GTYPE je LTYPE nebo `změněn'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -980,7 +985,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -994,7 +999,7 @@ msgstr "" " %[-][ŠÍŘKA][.[PŘES]]{doxX}c formát stylu printf pro číslo vstupního " "řádku" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1008,18 +1013,18 @@ msgstr "" " %c'C' jeden znak C\n" " %c'\\000' znak s osmičkovým kódem 000" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Pokusí se nalézt nejmenší sadu změn." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=POČET Ponechá POČET shodných řádků předpony a přípony." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1027,23 +1032,24 @@ msgstr "" "-H --speed-large-files Předpokládá velké soubory a mnoho rozptýlených\n" " drobných změn." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Informace o verzi." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "SOUBORY jsou `SOUBOR1 SOUBOR2' nebo `ADRESAR1 ADRESAR2' nebo\n" "`ADRESAR SOUBOR...' nebo `SOUBOR... ADRESAR'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." @@ -1051,54 +1057,61 @@ msgstr "" "Pokud je uveden --from-file nebo --to-file, pak nejsou u SOUBORů žádná " "omezení." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Pokud SOUBOR bude `-', bude čten standardní vstup." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Použití: %s [PŘEPÍNAČ]... SOUBORY\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Porovnání souborů řádek po řádku." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "pro přepínač %s konfliktní hodnota `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "konfliktní přepínače pro styl výstupu" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Pouze v %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "`-' s adresářem nelze porovnat" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D přepínač nepodporuje práci s adresáři" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Společné podadresáře: %s a %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Soubor %s je %s pokud soubor %s je %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Soubory %s a %s jsou různé\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Soubory %s a %s jsou identické\n" @@ -1114,11 +1127,12 @@ msgid "incompatible options" msgstr "nekompatibilní přepínače" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' zadáno pro více než jeden vstupní soubor" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "čtení selhalo" @@ -1154,13 +1168,12 @@ msgid "" msgstr "-x --overlap-only Vypíše překrývající se změny." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap Vypíše nesloučené změny, konflikty v závorkách." +msgstr "" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Přidá příkazy `w' a `q' do skriptů pro ed." #: src/diff3.c:438 @@ -1196,9 +1209,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Pokládá všechny soubory za text." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1249,30 +1261,30 @@ msgstr "vnitřní chyba: nesprávný typ diffu v process_diff" msgid "invalid diff format; invalid change separator" msgstr "neplatný formát diff souboru; neplatný oddělovač změny" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "neplatný formát diff souboru; nekompletní poslední řádek" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "pomocný program `%s' nelze spustit" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "neplatný formát diff souboru; nesprávné úvodní znaky na řádku" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "vnitřní chyba: nesprávný typ diffu pro výstup" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "vstupní soubor se zmenšil" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "nemohu porovnat jména souborů `%s' a `%s'" #: src/dir.c:209 @@ -1285,91 +1297,98 @@ msgstr "%s: smyčka v rekurzi adresářů" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o SOUBOR --output=SOUBOR Interaktivní práce, výstup půjde do SOUBORu." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Nerozlišuje velká a malá písmena." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Ignoruje změny v odsazení tabelátorem." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignoruje všechny mezery." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignoruje změny v počtu mezer." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignoruje všechny mezery." +msgstr "-W --ignore-all-space Ignoruje všechny mezery." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Ignoruje změny v případě prázdných řádků." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RV --ignore-matching-lines=RV Ignoruje změny na všech řádcích\n" +" odpovídajících RV." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Odstraní ukončovací znak CR na vstupu." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Pokládá všechny soubory za text." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w POČ --width=POČ Vypíše maximálně POČ (implicitně 130) znaků na řádek." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Vypíše pouze levý sloupec společných řádků." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nevypisuje shodné řádky." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Ve výstupu převede tabulátory na mezery." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" "--tabsize=POČ Tab zastavuje každých POČ (implicitně 8) tiskových sloupců." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Pokusí se nalézt nejmenší sadu změn." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1377,40 +1396,39 @@ msgstr "" "-H --speed-large-files Předpokládá velké soubory a mnoho rozptýlených\n" " drobných změn." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Použij PROGRAM k porovnání souborů." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Pokládá všechny soubory za text." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Informace o verzi." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Použití: %s [PŘEPÍNAČ]... SOUBOR1 SOUBOR2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Aplikace změn v souboru v módu `vedle sebe`." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "interaktivně nelze standardní vstup sloučit" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "oba soubory k porovnání jsou adresáři" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1440,49 +1458,15 @@ msgstr "" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent Žádný výstup; vrátí pouze status." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Informace o verzi." - #~ msgid "--help Output this help." #~ msgstr "--help Vypíše tuto nápovědu." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Porovnání tří souborů řádek po řádku." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion Ignoruje změny v odsazení tabelátorem." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Ignoruje změny v počtu mezer." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignoruje všechny mezery." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines Ignoruje změny v případě prázdných řádků." - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Odstraní ukončovací znak CR na vstupu." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Pokládá všechny soubory za text." - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1498,10 +1482,6 @@ msgstr "" #~ " tato změna nachází.\n" #~ " -F RV --show-function-line=RV Vypíše nejnovější řádky odpovídající RV." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Vytvoří skript pro ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1514,33 +1494,12 @@ msgstr "" #~ " --left-column Vypíše pouze levý sloupec společných řádků.\n" #~ " --suppress-common-lines Nevypíše společné řádky." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Ve výstupu převede tabulátory na mezery." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Na začátek řádků se vloží tabulátor." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=POČ Tab zastavuje každých POČ (implicitně 8) tiskových sloupců." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Pokusí se nalézt nejmenší sadu změn." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Předpokládá velké soubory a mnoho rozptýlených\n" #~ " drobných změn." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Vypíše všechny rozdíly, konflikty v závorkách." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Vypíše překrývající se změny, uzavřené v závorkách." @@ -1550,52 +1509,3 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L POPIS --label=POPIS Použije POPIS místo jména souboru." - -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAM Použij PROGRAM k porovnání souborů." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignoruje všechny mezery." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w POČ --width=POČ Vypíše maximálně POČ (implicitně 130) znaků na řádek." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Vypíše pouze levý sloupec společných řádků." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Předpokládá velké soubory a mnoho rozptýlených\n" -#~ " drobných změn." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "čtení selhalo" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "zápis selhal" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "čtení selhalo" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "čtení selhalo" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "zápis selhal" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "zápis selhal" Binary files differ@@ -1,16 +1,16 @@ # Danish diffutils translation po-file -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000, 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # # Claus Hindsgaul <claus_h@image.dk>, 2000-2002. -# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010. +# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010-2012. # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.0\n" +"Project-Id-Version: diffutils-3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2010-10-20 22:31+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-11-03 14:34+0100\n" "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\n" @@ -27,7 +27,7 @@ msgstr "programfejl" msgid "stack overflow" msgstr "stakoverløb" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Ukendt systemfejl" @@ -84,9 +84,9 @@ msgid "weird file" msgstr "mystisk fil" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tilvalg '%s' er flertydigt\n" +msgstr "%s: tilvalget '%s' er flertydigt; muligheder:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format @@ -140,100 +140,102 @@ msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "'" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "'" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Succes" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Ingen match" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ugyldigt regulært udtryk" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ugyldig sammenlignings-tegn" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ugyldigt navn på tegn-klasse" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Efterstillet backslash" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Ugyldig bagud-reference" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Uparret [ eller [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Uparret ( eller \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Uparret \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ugyldigt indhold af \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ugyldig område-afslutning" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Hukommelse opbrugt" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Ugyldigt foranstillet regulært udtryk" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "For tidlig afslutning på regulært udtryk" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "For stort regulært udtryk" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Uparret ) eller \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Intet foranstillet regulært udtryk" @@ -264,17 +266,17 @@ msgstr "kunne ikke genåbne %s i tilstand %s" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "ugyldigt %s%s-argument '%s'" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" +msgid "invalid suffix in %s%s argument '%s'" msgstr "ugyldig endelse i %s%s-argument '%s'" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "%s%s-argumentet '%s' er for stort" #: lib/version-etc.c:74 @@ -451,7 +453,7 @@ msgstr "Hjemmeside for %s: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Generel hjælp til GNU-programmer: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Filerne %s og %s er forskellige\n" @@ -461,7 +463,7 @@ msgstr "Filerne %s og %s er forskellige\n" msgid "Binary files %s and %s differ\n" msgstr "Binære filer %s og %s er forskellige\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Intet linjeskift ved filafslutning" @@ -475,75 +477,73 @@ msgstr "Torbjörn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." +msgid "Try '%s --help' for more information." msgstr "Prøv '%s --help' for mere information." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "ugyldig '--ignore-initial'-værdi `%s'" +msgid "invalid --ignore-initial value '%s'" +msgstr "ugyldig værdi '%s' for --ignore-initial" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "tilvalgene -l og -s er inkompatible" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "skrivning mislykkedes" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standard-ud" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-byte Vis afvigende byte." +msgstr "-b, --print-bytes vis afvigende byte" #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "" -"-i SPRING --ignore-initial=SPRING Overspring de første SPRING byte i " -"inddata." +"-i, --ignore-initial=SPRING spring de første SPRING byte over i begge\n" +" input" #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" -" Overspring de første SPRING1 byte i FIL1 og de første SPRING2 byte i FIL2." +"-i, --ignore-initial=SPRING1:SPRING2 spring de første SPRING1 byte af FIL1 " +"og\n" +" SPRING2 byte af FIL2 over" #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" -msgstr "-l --verbose Vis antal byte og værdierne for alle afvigende byte." +msgstr "" +"-l, --verbose vis numre og værdier for de byte, der er " +"forskellige" #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n GRÆNSE --bytes=GRÆNSE Sammenlign højst GRÆNSE byte." +msgstr "-n, --bytes=GRÆNSE sammenlign højst GRÆNSE byte" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent undertryk al normal udskrift" #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help vis denne hjælpetekst og afslut" #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Vis versions-info." +msgstr "-v, --version vis versionsoplysninger og afslut" #: src/cmp.c:178 #, c-format @@ -555,17 +555,19 @@ msgid "Compare two files byte by byte." msgstr "Sammenlign to filer byte for byte." #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." msgstr "" -"SPRING1 og SPRING2 er antallet af byte, der skal overspringes i hver fil." +"De valgfri SPRING1 og SPRING2 angiver antallet af byte, der skal springes\n" +"over ved begyndelsen af hver fil (normalt 0)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"Obligatoriske argumenter til lange tilvalg er også obligatoriske til de " +"korte.\n" #: src/cmp.c:191 msgid "" @@ -578,28 +580,28 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, og så videre for T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Såfremt en FIL er '_' eller mangler, læses fra standard inddata." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Såfremt en FIL er '-' eller mangler, læses fra standard-ind." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Slutstatus er 0 hvis inddata er ens, 1 hvis ikke, og 2 hvis der er problemer." #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "ugyldig '--bytes'-værdi '%s'" +msgid "invalid --bytes value '%s'" +msgstr "ugyldig værdi '%s' for --bytes" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "manglende operant efter '%s'" +msgid "missing operand after '%s'" +msgstr "manglende operand efter '%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "ekstra operant '%s'" +msgid "extra operand '%s'" +msgstr "ekstra operand '%s'" #: src/cmp.c:491 #, c-format @@ -617,347 +619,325 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: filafslutning på %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "ugyldig indholdslængde '%s'" +msgid "invalid context length '%s'" +msgstr "ugyldig kontekstlængde '%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "paginering understøttes ikke af denne vært" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "for mange fil-mærke tilvalg" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" +msgid "invalid width '%s'" msgstr "ugyldig bredde '%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "modstridende breddeangivelser" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "ugyldig horisont-længde '%s'" +msgid "invalid horizon length '%s'" +msgstr "ugyldig horisontlængde '%s'" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" +msgid "invalid tabsize '%s'" msgstr "ugyldig tabulatorbredde '%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "modstridende angivelser af tabulatorbredde" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "både --from-file og --to-file er angivet" -#: src/diff.c:851 -#, fuzzy +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" -msgstr "--normal Udlæs en almindelig diff." +msgstr " --normal udskriv en almindelig diff (forvalg)" -#: src/diff.c:852 -#, fuzzy +#: src/diff.c:855 msgid "-q, --brief report only when files differ" -msgstr "-q --brief Undersøg kun om filerne er ens eller ej." +msgstr "-q, --brief angiv kun når filerne er forskellige" -#: src/diff.c:853 -#, fuzzy +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" -msgstr "-s --report-identical-files Rapportér hvis to filer er ens." +msgstr "-s, --report-identical-files rapportér hvis to filer er ens" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w ANTAL --width=ANTAL Udskriv højst ANTAL (som standard 130) søjler per " -"linje." +"-c, -C ANTAL, --context[=ANTAL] udskriv ANTAL (normalt 3) linjer med " +"kopieret\n" +" kontekst" -#: src/diff.c:855 -#, fuzzy +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-w ANTAL --width=ANTAL Udskriv højst ANTAL (som standard 130) søjler per " -"linje." +"-u, -U ANTAL, --unified[=ANTAL] Udskriv højst ANTAL (normalt 3) linjer\n" +" forenet kontekst" -#: src/diff.c:856 -#, fuzzy +#: src/diff.c:859 msgid "-e, --ed output an ed script" -msgstr "-a --text Behandl alle filer som tekst." +msgstr "-e, --ed udskriv et ed-script" -#: src/diff.c:857 -#, fuzzy +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs Udlæs en diff i RCS-format." +msgstr "-n, --rcs udskriv en diff i RCS-format" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Vis versions-info." +msgstr "-y, --side-by-side udskriv i to kolonner" -#: src/diff.c:859 -#, fuzzy +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w ANTAL --width=ANTAL Udskriv højst ANTAL (som standard 130) søjler per " -"linje." +"-W, --width=ANTAL udskriv højst ANTAL (normalt 130) kolonner" -#: src/diff.c:860 -#, fuzzy +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column Vis kun venstre kolonne af identiske linjer." +msgstr "" +" --left-column udskriv kun venstre kolonne i fælles linjer" -#: src/diff.c:861 -#, fuzzy +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Udlæs ingen identiske linjer." +msgstr " --suppress-common-lines udskriv ikke fælles linjer" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" -msgstr "" +msgstr "-p, --show-c-function vis hvilken C-funktion hver ændring er i" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" -msgstr "" +msgstr "-F, --show-function-line=RE vis den seneste linje der matcher RE" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" +" --label MÆRKAT brug MÆRKAT frem for filnavn\n" +" (kan gentages)" -#: src/diff.c:868 -#, fuzzy +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs Lav tabulatorer om til mellemrum i output." +msgstr "" +"-t, --expand-tabs lav tabulatorer om til mellemrum i udskrift" -#: src/diff.c:869 -#, fuzzy +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Få tabulatorer på linje ved at forudstille en tabulator." +"-T, --initial-tab få tabulatorer på linje ved at forudstille en\n" +" tabulator" -#: src/diff.c:870 -#, fuzzy +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -"--tabsize=ANTAL Tabulatorstop for hver ANTAL (som standard 8) udskrevne " -"kolonner." +" --tabsize=ANTAL tabulatorstop for hver ANTAL (normalt 8) " +"kolonner" -#: src/diff.c:871 -#, fuzzy +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -"--suppress-blank-empty Intet mellemrum eller tabulator før tomme ud-linjer." +" --suppress-blank-empty intet mellemrum eller tabulator før tomme\n" +" ud-linjer" -#: src/diff.c:872 -#, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" -msgstr "-l --paginate Led uddata gennem 'pr' for at sideinddele det." +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "" +"-l, --paginate led uddata gennem 'pr' for at sideinddele det" -#: src/diff.c:874 -#, fuzzy +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" -msgstr "-r --recursive Sammenlign alle fundne underkataloger rekursivt." +msgstr "" +"-r, --recursive sammenlign alle fundne underkataloger " +"rekursivt" -#: src/diff.c:875 -#, fuzzy +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference følg ikke symbolske lænker" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file Behandl manglende filer som var de tomme." +msgstr "" +"-N, --new-file behandl manglende filer som var de tomme" -#: src/diff.c:876 -#, fuzzy +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -"--unidirectional-new-file Behandl første manglende filer som var de tomme." +" --unidirectional-new-file behandl manglende førstefiler som var de " +"tomme" -#: src/diff.c:877 -#, fuzzy +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -"--ignore-file-name-case Ignorér versalforskelle ved sammenligning af " -"filnavne." +" --ignore-file-name-case ingen forskel på store og små bogstaver ved\n" +" sammenligning af filnavne" -#: src/diff.c:878 -#, fuzzy +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -"--no-ignore-file-name-case Bemærk versalforskelle, når filnavne " -"sammenlignes." +" --no-ignore-file-name-case skeln mellem store og små bogstaver ved\n" +" sammenligning af filnavne" -#: src/diff.c:879 -#, fuzzy +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" -msgstr "-x MØNSTER --exclude=MØNSTER Udelad filer, det matcher MØNSTER." +msgstr "-x, --exclude=MØNSTER udelad filer, det matcher MØNSTER" -#: src/diff.c:880 -#, fuzzy +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X FIL --exclude-from=FIL Udelad filer, der matcher ethvert mønster i FIL." +"-X, --exclude-from=FIL udelad filer, der matcher ethvert mønster i " +"FIL" -#: src/diff.c:881 -#, fuzzy +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" -msgstr "-S FIL --starting-file=FIL Star med FIL, når kataloger sammenlignes." +msgstr "" +"-S, --starting-file=FIL start med FIL, når der sammenlignes kataloger" -#: src/diff.c:882 -#, fuzzy +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=FIL1 Sammenlign FIL1 med alle operanter. FIL1 må godt være et " -"katalog." +" --from-file=FIL1 sammenlign FIL1 med alle operander; FIL1 må\n" +" godt være et katalog" -#: src/diff.c:884 -#, fuzzy +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=FIL1 Sammenlign alle operanter med FIL2. FIL2 må godt være et " -"katalog." +" --to-file=FIL1 sammenlign alle operander med FIL2. FIL2 " +"må\n" +" godt være et katalog" -#: src/diff.c:887 -#, fuzzy +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" -msgstr "-i --ignore-case Ignorér versalforskelle i filindholdet" +msgstr "-i, --ignore-case ignorér versalforskelle i filindhold" -#: src/diff.c:888 -#, fuzzy +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Ignore ændringer, der skyldes tabulatoromsætning." +"-E, --ignore-tab-expansion ignorér ændringer der skyldes\n" +" tabulatoromsætning" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Ignorér alle mellemrums-tegn." +msgstr "" +"-Z, --ignore-trailing-space ignorér blanke tegn ved linjens afslutning" -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -"-b --ignore-space-change Ignorér ændringer i antallet af mellemrumstegn." +"-b, --ignore-space-change ignorér ændringer i mængden af blanke tegn" -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignorér alle mellemrums-tegn." +msgstr "-w, --ignore-all-space ignorér alle blanke tegn" -#: src/diff.c:892 -#, fuzzy +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "" -"-B --ignore-blank-lines Ignorér ændringer med udelukkende tomme linjer." +"-B, --ignore-blank-lines ignore changes where lines are all blank" +msgstr "-B, --ignore-blank-lines ignorér ændringer med kun tomme linjer" -#: src/diff.c:893 src/sdiff.c:178 -#, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I MØNSTER --ignore-matching-lines=MØNSTER Ignorér ændringer, hvis linjer " -"alle matcher MØNSTER." +"-I, --ignore-matching-lines=MØNSTER ignorér ændringer, hvis linjer alle\n" +" matcher MØNSTER" -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:899 msgid "-a, --text treat all files as text" -msgstr "-a --text Behandl alle filer som tekst." +msgstr "-a, --text behandl alle filer som tekst" -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "" -"--strip-trailing-cr Fjern afsluttende vognretur (carriage return) i inddata." +msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata" -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:902 msgid " --binary read and write data in binary mode" -msgstr "--binary Læs og skriv data binært." +msgstr " --binary læs og skriv data binært" -#: src/diff.c:901 -#, fuzzy +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D NAVN --ifdef=NAVN Udlæs flettet fil for at vise '#ifdef NAVN' ændringer." +"-D, --ifdef=NAVN udskriv flettet fil med '#ifdef NAVN'-differ" -#: src/diff.c:902 -#, fuzzy +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" -msgstr "" -"--GTYPE-group-format=GFMT Det samme, men formatér GTYPE-ind-grupper med " -"GFMT." +msgstr " --GTYPE-group-format=GFMT formatér GTYPE-inputgrupper med GFMT" -#: src/diff.c:903 -#, fuzzy +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" -msgstr "" -"--line-format=LFMT Det samme, men formatér alle indlæste linjer med LFMT." +msgstr " --line-format=LFMT formatér alle inputlinjer med LFMT" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" -msgstr "" -"--LTYPE-line-format=LFMT Det samme, men formatér LTYPE inddata med LFMT" +msgstr " --LTYPE-line-format=LFMT formatér LTYPE-inputlinjer med LFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +" Disse formattilvalg giver finkontrol over udskriften af diff, og\n" +" generaliserer -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYPE er 'gammel', 'ny' eller 'uændret'. GTYPE er LTYPE eller 'ændret'." +" LTYPE er 'old' (gammel), 'new' (ny) eller 'unchanged' (uændret).\n" +" GTYPE er LTYPE eller 'changed' (ændret)." -#: src/diff.c:908 -#, fuzzy +# hvad er PREC? Det står ingen steder i filen. PRÆC blev brugt i tidligere +# oversættelse, så beholder. -Ask +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -972,36 +952,34 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -" GFMT må indeholde:\n" -" %< linjer fra FIL1\n" +" GFMT (kun) må indeholde:\n" +" %< linjer fra FIL\n" " %> linjer fra FIL2\n" -" %= linjer, der er fælles mellem FIL1 og FIL2\n" -" %[-][BREDDE][.[PRÆC]]{doxX}BOGSTAV printf-type specifikation for " -"BOGSTAV\n" -" BOGSAV er som nedenfor for en ny gruppe, små bogstaver for gammel " -"gruppe:\n" +" %= linjer både i FIL1 og FIL2\n" +" %[-][BREDDE][.[PRÆC]]{doxX}BOGSTAV printf-angivelse for BOGSTAV\n" +" BOGSTAVer er som følger for ny gruppe, eller som små bogstaver for " +"gammel\n" +" gruppe:\n" " F første linjenummer\n" " L sidste linjenummer\n" " N antal linjer = L-F+1\n" " E F-1\n" -" M L+1" +" M L+1\n" +" %(A=B?T:E) hvis A lig med B så T, ellers E" -#: src/diff.c:920 -#, fuzzy +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -" LFMT må indeholde:\n" +" LFMT (kun) må indeholde:\n" " %L indhold af linje\n" -" %l indhold af linje, undtagen eventuel følgende linjeskift\n" -" %[-][BREDDE][.[PRÆC]]{doxX}n printf-stil angivelse af inddata " -"linjenummer" +" %l indhold af linje, undtagen eventuelt følgende linjeskift\n" +" %[-][BREDDE][.[PRÆC]]{doxX}n printf-angivelse for inputlinjenummer" -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1009,101 +987,103 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -" Enten kan GFMT eller LFMT indeholde:\n" -" %% %\n" -" %c'T' tegnet T alene\n" -" %c'\\000' tegnet med oktal kode 000" +" GFMT og LFMT kan begge indeholde:\n" +" %% %\n" +" %c'C' tegnet C\n" +" %c'\\OOO' tegnet med oktalkode OOO\n" +" C tegnet C (andre tegn repræsenterer sig selv)" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Grundigt forsøg på at finde et mindre antal ændringer." +msgstr "" +"-d, --minimal grundigt forsøg på at finde et mindre antal " +"ændringer" -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -"--horizon-lines=ANTAL Behold ANTAL linjer af fælles præfix og suffiks." +" --horizon-lines=ANTAL behold ANTAL linjer af fælles præfiks og suffiks" -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" -"-H --speed-large-files Antag store filer og mange spredte, små ændringer." +" --speed-large-files antag store filer og mange spredte, små ændringer" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" -msgstr "" +msgstr " --help vis denne hjælpetekst og afslut" -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:939 msgid "-v, --version output version information and exit" -msgstr "-v --version Vis versions-info." +msgstr "-v, --version vis versionsoplysninger og afslut" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FILER er 'FIL1 FIL2' eller 'KATALOG1 KATALOG2' eller 'KATALOG FIL...' eller " "'FIL... KATALOG'." -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -"hvis --from-file eller --to-file er angivet, er der ingen restriktioner på " -"FILER." +"Hvis --from-file eller --to-file er givet, er der ingen restriktioner på " +"FILer." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." msgstr "Såfremt en FIL er '-', læses fra standard-ind." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Brug: %s [TILVALG]... FILER\n" -#: src/diff.c:950 -#, fuzzy +#: src/diff.c:954 msgid "Compare FILES line by line." -msgstr "Sammenlign filer linje for linje" +msgstr "Sammenlign filer linjevis." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" +msgid "conflicting %s option value '%s'" msgstr "modstridende værdi for %s-tilvalget: '%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "modstridende valg af uddata-stil" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Kun i %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" msgstr "kan ikke sammenligne '-' med et katalog" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D tilvalg understøttes ikke for kataloger" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Identiske underkataloger: %s og %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Filen %s er en %s mens filen %s er en %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "De symbolske lænker %s og %s er forskellige\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Filerne %s og %s er identiske\n" @@ -1119,98 +1099,95 @@ msgid "incompatible options" msgstr "inkompatible tilvalg" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "'-' angiver mere en én ind-fil" +msgid "'-' specified for more than one input file" +msgstr "'-' angivet for mere end én ind-fil" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "læsning mislykkedes" #: src/diff3.c:428 -#, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" -msgstr "-A --show-all Udlæs alle ændringer, konflikter i paranteser." +msgstr "" +"-A, --show-all udskriv alle ændringer, med konflikter i " +"parenteser" #: src/diff3.c:430 -#, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed Udlæs uflettede ændringer mellem GAMMELFIL og DINFIL til MINFIL." +"-e, --ed udskriv et ed-script som udfører ændringerne\n" +" fra GAMMELFIL til DINFIL ind i MINFIL" #: src/diff3.c:432 -#, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" -msgstr "-E --show-overlap Udlæs uflettede ændringer, konflikter i paranteser" +msgstr "-E, --show-overlap som -e, men sæt konflikter i parentes" #: src/diff3.c:433 -#, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" -msgstr "-3 --easy-only Udlæs ikke-flettede, ikke-overlappende ændringer." +msgstr "" +"-3, --easy-only som -e, men inkludér kun ikke-overlappende " +"ændringer" #: src/diff3.c:434 -#, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only Vis kun overlappende ændringer." +msgstr "" +"-x, --overlap-only som -e, men inkludér kun overlappende ændringer" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap Udlæs uflettede ændringer, konflikter i paranteser" +msgstr "-X som -x, men sæt konflikter i parenteser" #: src/diff3.c:436 -#, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i Tilføj 'w' og 'q'-kommandoer til ed skripter." +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "-i tilføj 'w' og 'q'-kommandoer til ed-script" #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge udskriv faktisk flettet fil ifølge -A\n" +" hvis ingen andre tilvalg er givet" #: src/diff3.c:441 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Behandl alle filer som tekst." +msgstr "-a, --text behandl alle filer som tekst" #: src/diff3.c:442 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "" -"--strip-trailing-cr Fjern afsluttende vognretur (carriage return) i inddata." +msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata" #: src/diff3.c:443 -#, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Få tabulatorer på linje ved at forudstille en tabulator." +"-T, --initial-tab få tabulatorer på linje ved at forudstille\n" +" en tabulator" #: src/diff3.c:444 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" -msgstr "--diff-program=PROGRAM Brug PROGRAM til at sammenligne filerne." +msgstr " --diff-program=PROGRAM brug PROGRAM til at sammenligne filerne" #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=MÆRKAT brug MÆRKAT frem for filnavn\n" +" (kan gentages op til tre gange)" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Behandl alle filer som tekst." +msgstr " --help vis denne hjælpetekst og afslut" #: src/diff3.c:449 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Vis versions-info." +msgstr "-v, --version vis versionsoplysninger og afslut" #: src/diff3.c:458 #, c-format @@ -1234,6 +1211,18 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"Som standard bruges et rimelig læsevenligt udskriftsformat til " +"repræsentation\n" +"af ændringerne.\n" +"\n" +"Tilvalgene -e, -E, -x, -X (og de tilsvarende lange) får et ed-script til at\n" +"blive udskrevet frem for standardopførslen.\n" +"\n" +"Endelig får tilvalget -m (--merge) diff3 til at flette internt, og udskrive\n" +"den faktiske flettede fil. Til usædvanlige inddata er dette mere robust " +"end\n" +"med ed.\n" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." @@ -1258,30 +1247,30 @@ msgstr "intern fejl: ugyldig diff type i process_diff" msgid "invalid diff format; invalid change separator" msgstr "ugyldigt diff format; ugyldig ændrings-separator" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "ugyldigt diff format; uafsluttet sidste linje" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr "hjælpeprogrammet '%s' kunne ikke køres" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "ugyldigt diff format; forkerte linje-begyndelses-tegn" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "intern fejl: ugyldig diff type sendt til uddata" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "ind-fil formindskedes" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" +msgid "cannot compare file names '%s' and '%s'" msgstr "kan ikke sammenligne filnavnene '%s' og '%s'" #: src/dir.c:209 @@ -1294,136 +1283,126 @@ msgstr "%s: rekursiv katalogløkke" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 -#, fuzzy +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" -msgstr "-o FIL --output=FIL Arbejd interaktivt, send uddata til FIL." +msgstr "" +"-o, --output=FIL arbejd interaktivt, og send uddata til FIL" -#: src/sdiff.c:172 -#, fuzzy +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" -msgstr "-e --ignore-case Anse store og små bogstaver for at være ens." +msgstr "" +"-i, --ignore-case anse store og små bogstaver for at være ens" -#: src/sdiff.c:173 -#, fuzzy +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Ignore ændringer, der skyldes tabulatoromsætning." +"-E, --ignore-tab-expansion ignorér ændringer, der skyldes " +"tabulatoromsætning" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Ignorér alle mellemrums-tegn." +msgstr "" +"-Z, --ignore-trailing-space ignorér blanke tegn ved linjens afslutning" -#: src/sdiff.c:175 -#, fuzzy +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -"-b --ignore-space-change Ignorér ændringer i antallet af mellemrumstegn." +"-b, --ignore-space-change ignorér ændringer i mængden af blanke tegn" -#: src/sdiff.c:176 -#, fuzzy +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignorér alle mellemrums-tegn." +msgstr "-W, --ignore-all-space ignorér alle blanke tegn" -#: src/sdiff.c:177 -#, fuzzy +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B --ignore-blank-lines Ignorér ændringer med udelukkende tomme linjer." +"-B, --ignore-blank-lines ignorér ændringer med udelukkende blanke linjer" -#: src/sdiff.c:179 -#, fuzzy -msgid " --strip-trailing-cr strip trailing carriage return on input" +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" msgstr "" -"--strip-trailing-cr Fjern afsluttende vognretur (carriage return) i inddata." +"-I, --ignore-matching-lines=MØNSTER ignorér ændringer, hvis linjer alle\n" +" matcher MØNSTER" -#: src/sdiff.c:180 -#, fuzzy +#: src/sdiff.c:182 +msgid " --strip-trailing-cr strip trailing carriage return on input" +msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata" + +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" -msgstr "-a --text Behandl alle filer som tekst." +msgstr "-a, --text behandl alle filer som tekst" -#: src/sdiff.c:182 -#, fuzzy +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" -msgstr "" -"-w ANTAL --width=ANTAL Udskriv højst ANTAL (som standard 130) søjler per " -"linje." +msgstr "-w, --width=ANTAL udskriv højst ANTAL (normalt 130) søjler" -#: src/sdiff.c:183 -#, fuzzy +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column Vis kun venstre kolonne af identiske linjer." +msgstr "-l, --left-column vis kun venstre kolonne af fælles linjer" -#: src/sdiff.c:184 -#, fuzzy +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Udlæs ingen identiske linjer." +msgstr "-s, --suppress-common-lines vis ingen fælles linjer" -#: src/sdiff.c:186 -#, fuzzy +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs Lav tabulatorer om til mellemrum i output." +msgstr "-t, --expand-tabs lav tabulatorer om til mellemrum i output" -#: src/sdiff.c:187 -#, fuzzy +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" -"--tabsize=ANTAL Tabulatorstop for hver ANTAL (som standard 8) udskrevne " -"kolonner." +" --tabsize=ANTAL tabulatorstop for hver ANTAL (normalt 8) " +"kolonner" -#: src/sdiff.c:189 -#, fuzzy +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Grundigt forsøg på at finde et mindre antal ændringer." +msgstr "" +"-d, --minimal forsøg ihærdigt at finde et mindre antal " +"ændringer" -#: src/sdiff.c:190 -#, fuzzy +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H --speed-large-files Antag store filer og mange spredte, små ændringer." +"-H, --speed-large-files antag store filer og mange spredte, små " +"ændringer" -#: src/sdiff.c:191 -#, fuzzy +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" -msgstr "--diff-program=PROGRAM Brug PROGRAM til at sammenligne filerne." +msgstr " --diff-program=PROGRAM brug PROGRAM til at sammenligne filerne" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Behandl alle filer som tekst." +msgstr " --help vis denne hjælpetekst og afslut" -#: src/sdiff.c:194 -#, fuzzy +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" -msgstr "-v --version Vis versions-info." +msgstr "-v, --version vis versionsoplysninger og afslut" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Brug: %s [TILVALG]... FIL1 FIL2\n" -#: src/sdiff.c:205 -#, fuzzy +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Ved-siden-af-hinanden-sammenfletning af filforskelle." +msgstr "Side om side-fletning af forskelle mellem FIL1 og FIL2." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "kan ikke indflette standard input interaktivt" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "begge filer der sammenlignes er kataloger" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1452,173 +1431,32 @@ msgstr "" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "" -#~ "-s --quiet --silent Ingen udlæsning; sæt kun en afslutnings-slut-kode." - -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Vis versions-info." +#~ "-s --quiet --silent Ingen udskrift; sæt kun en afslutnings-slut-kode." #~ msgid "--help Output this help." -#~ msgstr "--help Vis denne hjælp." - -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Sammenlign tre filer linje for linje." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignore ændringer, der skyldes " -#~ "tabulatoromsætning." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Ignorér ændringer i antallet af mellemrumstegn." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorer alle mellemrumskarakterer." +#~ msgstr "--help Vis denne hjælpetekst." -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Ignorér ændringer med udelukkende tomme linjer." - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Fjern afsluttende vognretur (carriage return) i " -#~ "inddata." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Behandl alle filer som tekst." - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" -#~ "-c -C ANTAL --context[=ANTAL] Udlæs ANTAL (standard 3) linjer af " +#~ "-c -C ANTAL --context[=ANTAL] Udskriv ANTAL (normalt 3) linjer af " #~ "kopieret kontekst.\n" -#~ "-u -U ANTAL --unified[=ANTAL] Udlæs ANTAL (standard 3) linjer af " -#~ "unified kontekst.\n" +#~ "-u -U ANTAL --unified[=ANTAL] Udskriv ANTAL (normalt 3) linjer af " +#~ "forenet kontekst.\n" #~ " -L MÆRKE --label MÆRKE Brug MÆRKE i stedet for filnavn.\n" #~ " -p --show-c-function Vis hvilken C funktion hver ændring er i.\n" #~ " -F MØNSTER --show-function-line=MØNSTER Vis den sidste foregående " #~ "linje, der matcher MØNSTER." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Udlæs et ed skript." - -#~ msgid "" -#~ "-y --side-by-side Output in two columns.\n" -#~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" -#~ " --left-column Output only the left column of common lines.\n" -#~ " --suppress-common-lines Do not output common lines." -#~ msgstr "" -#~ "-y --side-by-side Udlæs i to kolonner.\n" -#~ " -W ANTAL --width=ANTAL Udlæs højst ANTAL (standard 130) " -#~ "skriftsøjler.\n" -#~ " --left-column Vis kun venstre kolonne af identiske linjer.\n" -#~ " --suppress-common-lines Udlæs ikke sammenfaldende linjer." - -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Lav tabulatorer om til mellemrum i output." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Få tabulatorer på linje ved at forudstille en tabulator." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=ANTAL Tabulatorstop for hver ANTAL (som standard 8) udskrevne " -#~ "kolonner." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "" -#~ "-d --minimal Grundigt forsøg på at finde et mindre antal ændringer." - -#~ msgid "" -#~ "--speed-large-files Assume large files and many scattered small changes." -#~ msgstr "" -#~ "--speed-large-files Antag store filer og mange spredte, små ændringer." - -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Udlæs alle ændringer, konflikter i paranteser." - -#~ msgid "-X Output overlapping changes, bracketing them." -#~ msgstr "-X Udlæs overlappende ændringer, i paranteser." - -#~ msgid "-m --merge Output merged file instead of ed script (default -A)." -#~ msgstr "" -#~ "-m --merge Udlæs flettet fil i stedet for ed skript (standard -A)." - #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L MÆRKE --label=MÆRKE Brug MÆRKE i stedet for filnavn." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAM Brug PROGRAM til at sammenligne filerne." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorer alle mellemrumskarakterer." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w ANTAL --width=ANTAL Udskriv højst ANTAL (som standard 130) søjler " -#~ "per linje." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Vis kun venstre kolonne af identiske linjer." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Antag store filer og mange spredte, små ændringer." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "læsning mislykkedes" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "skrivning mislykkedes" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "læsning mislykkedes" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "læsning mislykkedes" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "skrivning mislykkedes" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "skrivning mislykkedes" - #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" #~ "You may redistribute copies of this program\n" Binary files differ@@ -1,19 +1,21 @@ # German messages for GNU diffutils. +# This file is distributed under the same license as the diffutils package. # Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc. # Karl Eichwalder <keichwa@gmx.net>, 1996 -# Martin von Lwis <martin@v.loewis.de>, 1997, 2001, 2002 +# Martin von Löwis <martin@v.loewis.de>, 1997, 2001, 2002 +# Jakob Kramer <jakob.kramer@gmx.de>, 2012, 2013. # msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 2.8.2\n" +"Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2002-06-13 19:39+0200\n" -"Last-Translator: Martin von Lwis <martin@v.loewis.de>\n" -"Language-Team: German <de@li.org>\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2013-03-08 22:40+0100\n" +"Last-Translator: Jakob Kramer <jakob.kramer@gmx.de>\n" +"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" #: lib/c-stack.c:204 lib/c-stack.c:297 @@ -22,219 +24,219 @@ msgstr "Programmfehler" #: lib/c-stack.c:205 lib/c-stack.c:298 msgid "stack overflow" -msgstr "Stackberlauf" +msgstr "Stacküberlauf" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" -msgstr "Unbekannter Systemfehler." +msgstr "Unbekannter Systemfehler" #: lib/file-type.c:38 msgid "regular empty file" -msgstr "" +msgstr "normale leere Datei" #: lib/file-type.c:38 -#, fuzzy msgid "regular file" -msgstr "Lesefehler." +msgstr "normale Datei" #: lib/file-type.c:41 msgid "directory" -msgstr "" +msgstr "Verzeichnis" #: lib/file-type.c:44 msgid "block special file" -msgstr "" +msgstr "Blockorientiertes Gerät" #: lib/file-type.c:47 msgid "character special file" -msgstr "" +msgstr "Zeichenorientiertes Gerät" #: lib/file-type.c:50 msgid "fifo" -msgstr "" +msgstr "FIFO" #: lib/file-type.c:53 msgid "symbolic link" -msgstr "" +msgstr "symbolische Verknüpfung" #: lib/file-type.c:56 msgid "socket" -msgstr "" +msgstr "Socket" #: lib/file-type.c:59 msgid "message queue" -msgstr "" +msgstr "Nachrichten-Warteschlange" #: lib/file-type.c:62 msgid "semaphore" -msgstr "" +msgstr "Semaphor" #: lib/file-type.c:65 msgid "shared memory object" -msgstr "" +msgstr "gemeinsames Speicherobjekt" #: lib/file-type.c:68 msgid "typed memory object" -msgstr "" +msgstr "typisiertes Speicherobjekt" #: lib/file-type.c:70 -#, fuzzy msgid "weird file" -msgstr "Lesefehler." +msgstr "seltsame Datei" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Option %s ist mehrdeutig.\n" +msgstr "%s: Option »%s« ist mehrdeutig, Möglichkeiten:" #: lib/getopt.c:624 lib/getopt.c:628 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Option --%s verlangt kein Argument.\n" +msgstr "%s: Option »--%s« verlangt kein Argument.\n" #: lib/getopt.c:637 lib/getopt.c:642 -#, fuzzy, c-format +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: Option %c%s erlaubt kein Argument.\n" +msgstr "%s: Option »%c%s« erlaubt kein Argument.\n" #: lib/getopt.c:685 lib/getopt.c:704 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: Option %s verlangt ein Argument.\n" +msgstr "%s: Option »%s« verlangt ein Argument.\n" #: lib/getopt.c:742 lib/getopt.c:745 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: Unbekannte Option --%s.\n" +msgstr "%s: Unbekannte Option »--%s«.\n" #: lib/getopt.c:753 lib/getopt.c:756 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: Unbekannte Option %c%s.\n" +msgstr "%s: Unbekannte Option »%c%s«.\n" #: lib/getopt.c:805 lib/getopt.c:808 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: ungltige Option -- %c\n" +msgstr "%s: ungültige Option -- »%c«\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: Option verlangt ein Argument -- %c.\n" +msgstr "%s: Option verlangt ein Argument -- »%c«\n" #: lib/getopt.c:934 lib/getopt.c:950 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Option -W %s ist mehrdeutig.\n" +msgstr "%s: Option »-W %s« ist mehrdeutig\n" #: lib/getopt.c:974 lib/getopt.c:992 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Option -W %s erlaubt kein Argument.\n" +msgstr "%s: Option »-W %s« erlaubt kein Argument.\n" #: lib/getopt.c:1013 lib/getopt.c:1031 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Option %s verlangt ein Argument.\n" +msgstr "%s: Option »-W %s« verlangt ein Argument.\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" -msgstr "" +msgstr "»" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" -msgstr "" +msgstr "«" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Erfolg." -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" -msgstr "Keine bereinstimmung." +msgstr "Keine Übereinstimmung." -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" -msgstr "Ungltiger regulrer Ausdruck." +msgstr "Ungültiger regulärer Ausdruck." -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" -msgstr "Ungltiges Sortierzeichen." +msgstr "Ungültiges Sortierzeichen." -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" -msgstr "Ungltiger Name fr Zeichenklasse." +msgstr "Ungültiger Name für Zeichenklasse." -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Extra Backslash." -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" -msgstr "Ungltige Rckreferenz." +msgstr "Ungültige Rückreferenz." -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" -msgstr "ffnende [ oder [^ ohne schlieende." +msgstr "Öffnende [ oder [^ ohne schließende." -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" -msgstr "ffnende ( oder \\( ohne schlieende." +msgstr "Öffnende ( oder \\( ohne schließende." -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" -msgstr "ffnende \\{ ohne schlieende." +msgstr "Öffnende \\{ ohne schließende." -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "Ungltiger Inhalt von \\{\\}." +msgstr "Ungültiger Inhalt von \\{\\}." -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" -msgstr "Ungltiges Bereichsende." +msgstr "Ungültiges Bereichsende." -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Speicher verbraucht." -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" -msgstr "Ungliger vorhergehender regulrer Ausdruck." +msgstr "Ungüliger vorhergehender regulärer Ausdruck." -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" -msgstr "Vorzeitiges Ende des regulren Ausdrucks." +msgstr "Vorzeitiges Ende des regulären Ausdrucks." -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" -msgstr "Regulrer Ausdruck zu gro." +msgstr "Regulärer Ausdruck zu groß." -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" -msgstr "Schlieende ) oder \\) ohne ffnende." +msgstr "Schließende ) oder \\) ohne öffnende." -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" -msgstr "Kein vorhergehender regulrer Ausdruck." +msgstr "Kein vorhergehender regulärer Ausdruck." #: lib/xalloc-die.c:34 msgid "memory exhausted" @@ -242,57 +244,56 @@ msgstr "Speicher verbraucht." #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "Standardeingabe" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "Standardausgabe" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "Standardfehlerausgabe" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "Unbekannter Systemfehler." +msgstr "unbekannter Datenstrom" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" -msgstr "" +msgstr "%s konnte mit Modus %s nicht wieder geöffnet werden" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format -msgid "invalid %s%s argument `%s'" -msgstr "ungltiger --bytes-Wert %s." +#, c-format +msgid "invalid %s%s argument '%s'" +msgstr "ungültiges %s%s Argument »%s«" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "ungltige Horizontlnge '%s'." +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "ungültiger Suffix in %s%s Argument »%s«" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" -msgstr "" +msgid "%s%s argument '%s' too large" +msgstr "%s%s Argument »%s« zu groß" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Paket erstellt von %s (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Paket erstellt von %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "" +msgstr "©" #: lib/version-etc.c:86 msgid "" @@ -303,24 +304,31 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Lizenz GPLv3+: GNU GPL Version 3 oder später <http://www.gnu.org/licenses/" +"gpl.html>.\n" +"Dies ist freie Software: Sie dürfen sie verändern und verbreiten.\n" +"Es gibt KEINE GARANTIE, soweit diese nicht durch das Gesetz vorgeschrieben\n" +"wird.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Geschrieben von Thomas Lord." +msgstr "Geschrieben von %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:106 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" -msgstr "Geschrieben von Randy Smith." +msgstr "Geschrieben von %s und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:110 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "Geschrieben von Randy Smith." +msgstr "Geschrieben von %s, %s und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -331,6 +339,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Geschrieben von %s, %s, %s\n" +"und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -341,6 +351,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Geschrieben von %s, %s, %s,\n" +"%s und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -351,6 +363,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Geschrieben von %s, %s, %s,\n" +"%s, %s und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -361,6 +375,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Geschrieben von %s, %s, %s,\n" +"%s, %s, %s und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -372,6 +388,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Geschrieben von %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -383,6 +402,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Geschrieben von %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s und %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -394,6 +416,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Geschrieben von %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s und weiteren.\n" #. TRANSLATORS: The placeholder indicates the bug-reporting address #. for this package. Please add _another line_ saying @@ -405,27 +430,32 @@ msgid "" "\n" "Report bugs to: %s\n" msgstr "" +"\n" +"Fehlerberichte an %s.\n" +"Übersetzungsfehler an <http://translationproject.org/team/de.html>.\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "" +msgstr "Berichten Sie Fehler in %s an %s.\n" #: lib/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "Homepage von %s: <%s>.\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -msgstr "" +msgstr "Homepage von %s: <http://www.gnu.org/software/%s/>.\n" #: lib/version-etc.c:256 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" +"Generelle Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/gethelp/" +">.\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Dateien %s und %s sind verschieden.\n" @@ -433,93 +463,89 @@ msgstr "Dateien %s und %s sind verschieden.\n" #: src/analyze.c:462 #, c-format msgid "Binary files %s and %s differ\n" -msgstr "Binrdateien %s and %s sind verschieden.\n" +msgstr "Binärdateien %s und %s sind verschieden.\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Kein Zeilenumbruch am Dateiende." #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:43 msgid "Torbjorn Granlund" -msgstr "" +msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:44 msgid "David MacKenzie" -msgstr "" +msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "%s --help gibt Ihnen mehr Informationen." +msgid "Try '%s --help' for more information." +msgstr "»%s --help« gibt Ihnen mehr Informationen." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "ungltiger --ignore-initial-Wert %s." +msgid "invalid --ignore-initial value '%s'" +msgstr "ungültiger --ignore-initial-Wert »%s«" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "Die Optionen -l und -s sind inkompatibel." -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "Schreibfehler." -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "Standardausgabe" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes Verschiedene Bytes ausgeben." +msgstr "-b, --print-bytes Verschiedene Bytes ausgeben." #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "" -"-i SKIP --ignore-initial=SKIP Die ersten SKIP Bytes der Eingabe " -"berspringen." +"-i, --ignore-initial=SKIP Die ersten SKIP Bytes der Eingabe " +"überspringen." #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" -" Die ersten SKIP1 Bytes von DATEI1 und die ersten SKIP2 Bytes von DATEI2\n" -" berspringen." +"-i, --ignore-initial=SKIP1:SKIP2 Die ersten SKIP1 Bytes von DATEI1\n" +" und die ersten SKIP2 Bytes von DATEI2 " +"überspringen." #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" -"-l --verbose Bytenummern und Werte aller unterschiedlichen Bytes ausgeben." +"-l, --verbose Bytenummern und Werte aller unterschiedlichen " +"Bytes ausgeben." #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n LIMIT --bytes=LIMIT Hchstens LIMIT Bytes vergleichen." +msgstr "-n, --bytes=LIMIT Höchstens LIMIT Bytes vergleichen." #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent Alle normalen Ausgaben unterdrücken." #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help Diese Hilfe anzeigen und beenden." #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v -version Versionsinformation ausgeben." +msgstr "-v, -version Versionsinformation ausgeben und beenden." #: src/cmp.c:178 #, c-format @@ -528,21 +554,21 @@ msgstr "Aufruf: %s [OPTION]... DATEI1 [DATEI2 [SKIP1 [SKIP2]]]\n" #: src/cmp.c:180 msgid "Compare two files byte by byte." -msgstr "Zwei Dateien Byte fr Byte vergleichen." +msgstr "Zwei Dateien Byte für Byte vergleichen." #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." msgstr "" -"SKIP1 und SKIP2 ist die Zahl der Bytes, die in jeder Datei bersprungen " -"werden." +"Die optionalen Argumente SKIP1 und SKIP2 geben die Zahl der Bytes an,\n" +"die in jeder Datei übersprungen werden (standardmäßig null)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"Nötige Argumente für lange Optionen sind auch für kurze Optionen nötig.\n" #: src/cmp.c:191 msgid "" @@ -550,37 +576,39 @@ msgid "" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." msgstr "" -"SKIP-Werte drfen die folgenden multiplikativen Anhnge haben:\n" +"SKIP-Werte dürfen die folgenden multiplikativen Anhänge haben:\n" "kB 1000, K 1024, MB 1.000.000, M 1.048.576,\n" -"GB 1.000.000.000, G 1.073.741.824, und so weiter fr T, P, E, Z, Y." +"GB 1.000.000.000, G 1.073.741.824, und so weiter für T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Wenn DATEI - ist oder fehlt, von der Standardeingabe lesen." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Wenn DATEI »-« ist oder fehlt, von der Standardeingabe lesen." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" +"Der Rückgabewert des Programms ist 0, falls die Eingaben identisch\n" +"sind, 1 falls sie gleich sind und 2 falls es Probleme gab." #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "ungltiger --bytes-Wert %s." +msgid "invalid --bytes value '%s'" +msgstr "ungültiger --bytes-Wert »%s«" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "Fehlender Operand nach %s." +msgid "missing operand after '%s'" +msgstr "fehlender Operand nach »%s«" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "extra Argument %s." +msgid "extra operand '%s'" +msgstr "extra Operand »%s«." #: src/cmp.c:491 #, c-format msgid "%s %s differ: byte %s, line %s\n" -msgstr "%s %s differieren: Byte %s, Zeile %s.\n" +msgstr "%s %s differieren: Byte %s, Zeile %s\n" #: src/cmp.c:507 #, c-format @@ -593,348 +621,338 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF auf %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" -msgstr "" +msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" -msgstr "" +msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" -msgstr "" +msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" -msgstr "" +msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" -msgstr "" +msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "Ungltige Kontextlnge %s." +msgid "invalid context length '%s'" +msgstr "ungültige Kontextlänge »%s«" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" -msgstr "Seitenumbruch ist auf diesem System nicht untersttzt." +msgstr "Seitenumbruch ist auf diesem System nicht unterstützt." -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "Zu viele Datei-Label-Optionen." -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "Ungltig mit %s." +msgid "invalid width '%s'" +msgstr "ungültige Breite »%s«" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" -msgstr "Widersprchliche Breitenoptionen" +msgstr "Widersprüchliche Breitenoptionen" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "ungltige Horizontlnge '%s'." +msgid "invalid horizon length '%s'" +msgstr "ungültige Horizontlänge »%s«" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "Ungltige Tabulatorbreite %s." +msgid "invalid tabsize '%s'" +msgstr "ungültige Tabulatorbreite »%s«" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" -msgstr "Widersprchliche Tabulatorbreitenoptionen." +msgstr "Widersprüchliche Tabulatorbreitenoptionen." -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file und --to-file sind beide angegeben." -#: src/diff.c:851 -#, fuzzy +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" -msgstr "--normal Ein normales Diff ausgeben." +msgstr " --normal Ein normales Diff ausgeben (Standard)." -#: src/diff.c:852 -#, fuzzy +#: src/diff.c:855 msgid "-q, --brief report only when files differ" -msgstr "-q --brief Nur ausgeben ob die Dateien verschieden sind." +msgstr "" +"-q, --brief Nur ausgeben, ob die Dateien verschieden sind." -#: src/diff.c:853 -#, fuzzy +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" -msgstr "-s --report-identical-files Meldung, wenn zwei Dateien gleich sind." +msgstr "-s, --report-identical-files Meldung, wenn zwei Dateien gleich sind." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w ZAHL --width=ZAHL Maximal ZAHL Druckspalten pro Zeile (Vorgabe: 130)." +"-c, -C ZAHL, --context[=ZAHL] ZAHL Zeilen des kopierten Kontexts ausgeben " +"(Vorgabe: 3)." -#: src/diff.c:855 -#, fuzzy +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-w ZAHL --width=ZAHL Maximal ZAHL Druckspalten pro Zeile (Vorgabe: 130)." +"-u, -U ZAHL, --unified[=ZAHL] ZAHL Zeilen des Unified-Kontexts ausgeben " +"(Vorgabe: 3)." -#: src/diff.c:856 -#, fuzzy +#: src/diff.c:859 msgid "-e, --ed output an ed script" -msgstr "-a --text Betrachte alle Dateien als Text." +msgstr "-e, --ed Ein ed-Skript ausgeben." -#: src/diff.c:857 -#, fuzzy +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs Ausgabe im Diff-Format von RCS." +msgstr "-n, --rcs Im RCS-Format ausgeben." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v -version Versionsinformation ausgeben." +msgstr "-y, --side-by-side In zwei Spalten ausgeben." -#: src/diff.c:859 -#, fuzzy +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w ZAHL --width=ZAHL Maximal ZAHL Druckspalten pro Zeile (Vorgabe: 130)." +"-W, --width=ZAHL Maximal ZAHL Druckspalten pro Zeile ausgeben " +"(Vorgabe: 130)." -#: src/diff.c:860 -#, fuzzy +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column Nur linke Spalte der gemeinsamen Zeilen ausgeben." +msgstr "" +" --left-column Nur linke Spalte der gemeinsamen Zeilen " +"ausgeben." -#: src/diff.c:861 -#, fuzzy +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Keine gemeinsamen Zeilen ausgeben." +msgstr " --suppress-common-lines Keine gemeinsamen Zeilen ausgeben." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" +"-p, --show-c-function Für jede Änderung zeigen, in welcher C-" +"Funktion sie ist" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" +"-F, --show-function-line=RE Die neueste Zeile, die dem Muster RE " +"entspricht, zeigen" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" +" --label LABEL LABEL statt Dateinamens benutzen\n" +" (kann wiederholt werden)" -#: src/diff.c:868 -#, fuzzy +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t -expand-tabs Tabulatoren zu Leerzeichen in der Ausgabe ausdehnen." +msgstr "" +"-t, -expand-tabs Tabulatoren zu Leerzeichen in der Ausgabe " +"ausdehnen." -#: src/diff.c:869 -#, fuzzy +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Einrckungen durch vorangestellte Tabulatoren erzeugen." +"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren " +"erzeugen." -#: src/diff.c:870 -#, fuzzy +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" -msgstr "--tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten (Vorgabe: 8)." +msgstr "" +" --tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten " +"(Vorgabe: 8)." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" +" --suppress-blank-empty Leerzeichen oder Tabulator vor leeren\n" +" Ausgabezeilen verhindern." -#: src/diff.c:872 -#, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" -msgstr "-l --paginate Ausgabe an pr zum Seitenumbruch bergeben." +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "" +"-l, --paginate Ausgabe an »pr« zum Seitenumbruch übergeben." -#: src/diff.c:874 -#, fuzzy +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" -msgstr "-r --recursive Rekursiv alle Unterverzeichnisse vergleichen." +msgstr "" +"-r, --recursive Rekursiv alle Unterverzeichnisse vergleichen." -#: src/diff.c:875 -#, fuzzy +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" +" --no-derefence Symbolischen Verknüpfungen nicht folgen" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file Fehlende Dateien als leer betrachten." +msgstr "-N, --new-file Fehlende Dateien als leer betrachten." -#: src/diff.c:876 -#, fuzzy +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -"--unidirectional-new-file Die ersten fehlenden Dateien als leer betrachten." +" --unidirectional-new-file Die ersten fehlenden Dateien als leer " +"betrachten." -#: src/diff.c:877 -#, fuzzy +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -"--ignore-file-name-case Unterschiede der Gro/Kleinschreibung von " +" --ignore-file-name-case Unterschiede der Groß/Kleinschreibung von " "Dateinamen\n" -" ignorieren." +" ignorieren." -#: src/diff.c:878 -#, fuzzy +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -"--no-ignore-file-name-case Unterschiede der Gro/Kleinschreibung von \n" -" Dateinamen beachten." +" --no-ignore-file-name-case Unterschiede der Groß/Kleinschreibung von \n" +" Dateinamen beachten." -#: src/diff.c:879 -#, fuzzy +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" -"-x MUSTER --exclude=MUSTER Dateien, die auf MUSTER passen, ausschlieen." +"-x, --exclude=MUSTER Dateien, die auf MUSTER passen, ausschließen." -#: src/diff.c:880 -#, fuzzy +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X DATEI --exclude-from=DATEI Dateien berspringen, die auf eines der " +"-X, --exclude-from=DATEI Dateien überspringen, die auf eines der\n" "Muster in DATEI passen." -#: src/diff.c:881 -#, fuzzy +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -"-S DATEI --starting-file=DATEI Beim Verzeichnisvergleich mit DATEI " -"beginnen." +"-S, --starting-file=DATEI Beim Verzeichnisvergleich mit DATEI beginnen." -#: src/diff.c:882 -#, fuzzy +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=DATEI1 DATEI1 mit allen Operanden vergleichen.\n" -" DATEI1 kann ein Verzeichnis sein." +" --from-file=DATEI1 DATEI1 mit allen Operanden vergleichen.\n" +" DATEI1 kann ein Verzeichnis sein." -#: src/diff.c:884 -#, fuzzy +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=DATEI2 Alle Operanden mit DATEI2 vergleichen.\n" -" DATEI2 kann ein Verzeichnis sein." +" --to-file=DATEI2 Alle Operanden mit DATEI2 vergleichen.\n" +" DATEI2 kann ein Verzeichnis sein." -#: src/diff.c:887 -#, fuzzy +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -"-i --ignore-case Unterschiede der Gro/Kleinschreibung im Dateiinhalt \n" +"-i, --ignore-case Unterschiede der Groß/Kleinschreibung im Dateiinhalt\n" " ignorieren." -#: src/diff.c:888 -#, fuzzy +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion nderungen aufgrund von Tabausdehnungen " +"-E, --ignore-tab-expansion Änderungen aufgrund von Tabausdehnungen " "ignorieren." -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Freiraum ignorieren." +msgstr "-Z, --ignore-trailing-space Freiraum am Zeilenende ignorieren." -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change Ignoriere nderungen im Leerraum." +msgstr "-b, --ignore-space-change Ignoriere Änderungen im Leerraum." -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Freiraum ignorieren." +msgstr "-w, --ignore-all-space Freiraum ignorieren." -#: src/diff.c:892 -#, fuzzy +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B, --ignore-blank-lines Die nderungen bergehen, wo die Zeilen leer sind." +"-B, --ignore-blank-lines Die Änderungen übergehen, wo alle Zeilen " +"leer sind." -#: src/diff.c:893 src/sdiff.c:178 -#, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I RE --ignore-matching-lines=RE nderungen ignorieren, deren Zeilen \n" -" auf das Muster RE passen." +"-I, --ignore-matching-lines=RE Änderungen ignorieren, bei denen alle " +"Zeilen\n" +" auf das Muster RE passen." -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:899 msgid "-a, --text treat all files as text" -msgstr "-a --text Betrachte alle Dateien als Text." +msgstr "-a, --text Alle Dateien als Text behandeln." -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Wagenrcklauf (CR) am Zeilenende beim Einlesen " -"entfernen." +" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim " +"Einlesen entfernen." -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:902 msgid " --binary read and write data in binary mode" -msgstr "--binary Daten im Binrmodus lesen und schreiben." +msgstr "" +" --binary Daten im Binärmodus lesen und schreiben." -#: src/diff.c:901 -#, fuzzy +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" -msgstr "-D NAME --ifdef=NAME Datei mit #ifdef NAME in die Ausgabe mischen." +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" +msgstr "" +"-D, --ifdef=NAME Zusammengefügte Datei mit »#ifdef NAME« in\n" +" die Ausgabe mischen." -#: src/diff.c:902 -#, fuzzy +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" -msgstr "" -"--GTYPE-group-format=GFMT hnlich, GTYPE-Eingabe jedoch mit GFMT " -"formatieren." +msgstr " --GTYPE-group-format=GFMT GTYPE-Eingabe mit GFMT formatieren." -#: src/diff.c:903 -#, fuzzy +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -"--line-format=LFMT hnlich, aber alle Eingabe-Zeilen mit LFMT formatieren." +" --line-format=LFMT Alle Eingabe-Zeilen mit LFMT formatieren." -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" -msgstr "" -"--LTYPE-line-format=LFMT hnlich, LTYPE-Eingabe jedoch mit LFMT formatieren." +msgstr " --LTYPE-line-format=LFMT LTYPE-Eingabe mit LFMT formatieren." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +" Diese Formatoptionen stellen haargenaue Kontrolle über die Eingabe\n" +" von diff bereit, indem -D/--ifdef verallgemeinert wird." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYPE kann old, new oder unchanged sein. GTYPE ist LTYPE oder " -"changed." +" LTYPE kann »old«, »new« oder »unchanged« sein. GTYPE ist LTYPE oder " +"»changed«." -#: src/diff.c:908 -#, fuzzy +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -949,34 +967,34 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -" GFMT kann enthalten:\n" +" GFMT kann (nur) enthalten:\n" " %< Zeilen von DATEI1.\n" " %> Zeilen von DATEI2.\n" -" %= Zeilen, die sowohl zu DATEI1 als auc zu DATEI2 gehren.\n" -" %[-][BREITE][.[PRZ]]{doxX}BUCHST Ausgabe nach printf-Regeln fr " +" %= Zeilen, die sowohl zu DATEI1 als auc zu DATEI2 gehören.\n" +" %[-][BREITE][.[PRÄZ]]{doxX}BUCHST Ausgabe nach printf-Regeln für " "BUCHST.\n" -" Folgende BUCHTSTaben gelten fr neue Gruppen, Kleinschreibung fr " +" Folgende BUCHTSTaben gelten für neue Gruppen, Kleinschreibung für " "alte:\n" " F Erste Zeilennummer.\n" " L Letzte Zeilennummer.\n" " N Zahl der Zeilen = L-F+1.\n" -" E F-1." +" E F-1.\n" +" M L+1.\n" +" %(A=B?T:E) Falls A gleich B, dann T, sonst E." -#: src/diff.c:920 -#, fuzzy +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -" LFMT kann enthalten:\n" +" LFMT kann (nur) enthalten:\n" " %L Inhalt der Zeile.\n" " %l Inhalt der Zeile, ohne Newline am Ende.\n" -" %[-][BREITE][.[PRZ]]{doxX}n Zeilennummer im printf-Stil." +" %[-][BREITE][.[PRÄZ]]{doxX}n Zeilennummer im printf-Stil." -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -984,112 +1002,113 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -" Sowohl GFMT als auch LFMT knnen folgendes enthalten:\n" +" GFMT und LFMT können enthalten:\n" " %% %\n" " %c'C' das einzelne Zeichen C\n" -" %c'\\000' das Zeichen mit dem Oktalcode 000" +" %c'\\OOO' das Zeichen mit dem Oktalcode OOO\n" +" C Das Zeichen C (andere Zeichen stellen sich selbst dar)" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -"-d --minimal Aufwendig nach einem kleineren Satz von nderungen suchen." +"-d, --minimal Aufwendig nach einem kleineren Satz von Änderungen " +"suchen." -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -"--horizon-lines=ZAHL Behalte ZAHL Zeilen mit gemeinsamen Pre- und Suffix." +" --horizon-lines=ZAHL Behalte ZAHL Zeilen mit gemeinsamem Prä- und Suffix." -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" -"-H --speed-large-files Es werden groe Dateien und viele nderungen " -"vermutet." +" --speed-large-files Es werden große Dateien und viele verstreute, " +"kleine\n" +" Änderungen vermutet." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" -msgstr "" +msgstr " --help Diese Hilfe anzeigen und beenden." -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:939 msgid "-v, --version output version information and exit" -msgstr "-v -version Versionsinformation ausgeben." +msgstr "-v, -version Versionsinformation ausgeben und beenden." -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"DATEIEN sind 'DATEI1 DATEI2' oder 'VERZ1 VERZ2' oder \"VERZ DATEI...\" \n" -"oder \"DATEI... VERZ;" +"DATEIEN sind »DATEI1 DATEI2« oder »VERZ1 VERZ2« oder »VERZ DATEI...«\n" +"oder »DATEI... VERZ«." -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -"Wenn --from-file oder --to-file angegeben werden, gibt es keine \n" -"Einschrnkungen fr DATEIEN." +"Wenn --from-file oder --to-file angegeben werden, gibt es keine\n" +"Einschränkungen für DATEI(EN)." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Wenn DATEI - ist, von der Standardeingabe lesen." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Wenn DATEI »-« ist, von der Standardeingabe lesen." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Aufruf: %s [OPTION]... DATEIEN\n" -#: src/diff.c:950 -#, fuzzy +#: src/diff.c:954 msgid "Compare FILES line by line." -msgstr "Vergleichen Sie Dateien Zeile fr Zeile." +msgstr "Dateien Zeile für Zeile vergleichen." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "Widersprchlicher Optionswert %s fr %s." +msgid "conflicting %s option value '%s'" +msgstr "Widersprüchlicher %s Optionswert »%s«." -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" -msgstr "Widersprchliche Optionenen fr den Ausgabestil." +msgstr "Widersprüchliche Optionenen für den Ausgabestil." -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Nur in %s: %s.\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "- kann nicht mit Verzeichnis verglichen werden." +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "»-« kann nicht mit Verzeichnis verglichen werden." -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" -msgstr "Option -D nicht untersttzt bei Verzeichnissen" +msgstr "Option -D nicht unterstützt bei Verzeichnissen" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Gemeinsame Unterverzeichnisse: %s und %s.\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" -msgstr "Datei %s ist ein %s whrend Datei %s ein %s ist.\n" +msgstr "Datei %s ist ein %s während Datei %s ein %s ist.\n" + +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Symbolische Verknüpfungen %s und %s sind verschieden.\n" -#: src/diff.c:1335 +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Dateien %s und %s sind identisch.\n" #. This is a proper name. See the gettext manual, section Names. #: src/diff3.c:41 -#, fuzzy msgid "Randy Smith" -msgstr "Geschrieben von Randy Smith." +msgstr "Randy Smith" #: src/diff3.c:313 #, c-format @@ -1097,105 +1116,100 @@ msgid "incompatible options" msgstr "Inkompatible Optionen." #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "- fr mehr als eine Eingabedatei angegeben." +msgid "'-' specified for more than one input file" +msgstr "»-« für mehr als eine Eingabedatei angegeben." -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "Lesefehler." #: src/diff3.c:428 -#, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" -msgstr "-A --show-all Alle nderungen ausgeben, Konflikte in Klammern." +msgstr "" +"-A, --show-all Alle Änderungen ausgeben, Konflikte in Klammern." #: src/diff3.c:430 -#, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed Nicht in DEINEDATEI bernommene nderungen aus ALTEDATEI in " -"MEINEDATEI abspeichern." +"-e, --ed ed-Script ausgeben, das die Änderungen\n" +" von DEINEDATEI und ALTEDATEI in MEINEDATEI\n" +" integriert." #: src/diff3.c:432 -#, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" -msgstr "" -"-E --show-overlap Ungemische nderungen anzeigen, Konflikte in Klammern." +msgstr "-E --show-overlap Wie -e, aber Konflikte in Klammern." #: src/diff3.c:433 -#, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -"-3, --easy-only Nicht-zusammengefhrte (`unmerged') nichtberlappende " -"nderungen ausgeben." +"-3, --easy-only Wie -e, aber nur nichtüberlappende Änderungen " +"integrieren." #: src/diff3.c:434 -#, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only berlappende nderungen ausgeben." +msgstr "" +"-x, --overlap-only Wie -e, aber nur überlappende Änderungen " +"integrieren." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "" -"-E --show-overlap Ungemische nderungen anzeigen, Konflikte in Klammern." +msgstr "-X Wie -x, aber Konflikte in Klammern." #: src/diff3.c:436 -#, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i An ed-Skripte w- und q-Kommandos anhngen." +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "" +"-i An ed-Skripte »w«- und »q«-Befehle anhängen." #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge Zusammengefügte Datei ausgeben, wie -A,\n" +" falls keine anderen Optionen übergeben wurden." #: src/diff3.c:441 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Betrachte alle Dateien als Text." +msgstr "-a, --text Alle Dateien als Text behandeln." #: src/diff3.c:442 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Wagenrcklauf (CR) am Zeilenende beim Einlesen " +" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim Einlesen " "entfernen." #: src/diff3.c:443 -#, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Einrckungen durch vorangestellte Tabulatoren erzeugen." +"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren " +"erzeugen." #: src/diff3.c:444 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden." +" --diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden." #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=LABEL LABEL statt Dateinamens benutzen\n" +" (kann bis zu dreimal wiederholt werden)" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Betrachte alle Dateien als Text." +msgstr " --help Diese Hilfe anzeigen und beenden." #: src/diff3.c:449 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v -version Versionsinformation ausgeben." +msgstr "-v, --version Versionsinformation ausgeben und beenden." #: src/diff3.c:458 #, c-format @@ -1204,7 +1218,7 @@ msgstr "Benutzung: %s [OPTION]... MEINEDATEI ALTEDATEI DEINEDATEI\n" #: src/diff3.c:460 msgid "Compare three files line by line." -msgstr "Drei Dateien Zeile fr Zeile vergleichen." +msgstr "Drei Dateien Zeile für Zeile vergleichen." #: src/diff3.c:470 msgid "" @@ -1219,202 +1233,211 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"Das Standardausgabeformat ist eine einigermaßen menschenlesbare\n" +"Repräsentierung der Änderungen.\n" +"\n" +"Die Optionen -e, -E, -x und -X (und deren entsprechende lange Versionen)\n" +"erzeugen ein ed-Skript als Ausgabe statt des Standards.\n" +"\n" +"Abschließend versucht die Option -m (--merge), dass diff3 die Änderungen\n" +"intern zusammenführt und die eigentliche, zusammengeführte Datei ausgegeben\n" +"wird. Für ungewöhnliche Eingaben ist dies robuster, als ed zu benutzen.\n" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" +"Der Rückgabewert des Programms ist 0, falls es erfolgreich ist, 1 falls\n" +"es Konflikte gibt und 2 falls Probleme auftreten." #: src/diff3.c:675 msgid "internal error: screwup in format of diff blocks" -msgstr "Interner Fehler: Format fr diff-Blcke ist durcheinander." +msgstr "Interner Fehler: Format für diff-Blöcke ist durcheinander." #: src/diff3.c:968 #, c-format msgid "%s: diff failed: " -msgstr "%s: diff ist gescheitert: " +msgstr "%s: »diff« ist gescheitert: " #: src/diff3.c:990 msgid "internal error: invalid diff type in process_diff" -msgstr "Interner Fehler: Ungltiger diff-Typ in process_diff." +msgstr "Interner Fehler: Ungültiger diff-Typ in process_diff." #: src/diff3.c:1015 msgid "invalid diff format; invalid change separator" -msgstr "Ungltiges Diff-Format; ungltiger nderungstrenner." +msgstr "Ungültiges Diff-Format; ungültiger Änderungstrenner." -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" -msgstr "Ungltiges Diff-Format; felende letzte Zeile." +msgstr "Ungültiges Diff-Format; felende letzte Zeile." -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, fuzzy, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "Unterprogramm %s nicht gefunden." +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, c-format +msgid "subsidiary program '%s' could not be invoked" +msgstr "Unterprogramm »%s« konnte nicht aufgerufen werden." -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" -msgstr "Ungltiges Diff-Format; inkorrektes Zeichen in fhrender Zeile" +msgstr "Ungültiges Diff-Format; inkorrektes Zeichen in führender Zeile" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" -msgstr "Interner Fehler: Ungltiger diff-Typ an Ausgabe bergeben." +msgstr "Interner Fehler: Ungültiger diff-Typ an Ausgabe übergeben." -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "Eingabedatei schrumpfte." #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "Die Dateinamen %s und %s knnen nicht verglichen werden." +msgid "cannot compare file names '%s' and '%s'" +msgstr "Die Dateinamen »%s« und »%s« können nicht verglichen werden." #: src/dir.c:209 #, c-format msgid "%s: recursive directory loop" -msgstr "" +msgstr "%s: Rekursive Verzeichnisschleife" #. This is a proper name. See the gettext manual, section Names. #: src/sdiff.c:42 -#, fuzzy msgid "Thomas Lord" -msgstr "Geschrieben von Thomas Lord." +msgstr "Thomas Lord" -#: src/sdiff.c:170 -#, fuzzy +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" -"-o DATEI --output=DATEI Interaktiv arbeiten, Ausgabe in DATEI speichern." +"-o, --output=DATEI Interaktiv arbeiten, Ausgabe in DATEI speichern." -#: src/sdiff.c:172 -#, fuzzy +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" -"-i --ignore-case Nicht zwischen Gro- und Kleinschreibung unterscheiden." +"-i, --ignore-case Nicht zwischen Groß- und Kleinschreibung " +"unterscheiden." -#: src/sdiff.c:173 -#, fuzzy +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion nderungen aufgrund von Tabausdehnungen " +"-E, --ignore-tab-expansion Änderungen aufgrund von Tabausdehnungen " "ignorieren." -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Freiraum ignorieren." +msgstr "-Z, --ignore-trailing-space Freiraum am Zeilenende ignorieren." -#: src/sdiff.c:175 -#, fuzzy +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change Ignoriere nderungen im Leerraum." +msgstr "-b, --ignore-space-change Ignoriere Änderungen im Leerraum." -#: src/sdiff.c:176 -#, fuzzy +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Freiraum ignorieren." +msgstr "-W, --ignore-all-space Leerraum ignorieren." -#: src/sdiff.c:177 -#, fuzzy +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B, --ignore-blank-lines Die nderungen bergehen, wo die Zeilen leer sind." +"-B, --ignore-blank-lines Die Änderungen übergehen, wo die Zeilen leer " +"sind." -#: src/sdiff.c:179 -#, fuzzy +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE Änderungen ignorieren, bei denen alle " +"Zeilen\n" +" auf das Muster RE passen." + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Wagenrcklauf (CR) am Zeilenende beim Einlesen " +" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim Einlesen " "entfernen." -#: src/sdiff.c:180 -#, fuzzy +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" -msgstr "-a --text Betrachte alle Dateien als Text." +msgstr "-a, --text Betrachte alle Dateien als Text." -#: src/sdiff.c:182 -#, fuzzy +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w ZAHL --width=ZAHL Maximal ZAHL Druckspalten pro Zeile (Vorgabe: 130)." +"-w, --width=ZAHL Maximal ZAHL Druckspalten pro Zeile (Vorgabe: " +"130)." -#: src/sdiff.c:183 -#, fuzzy +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column Nur linke Spalte der gemeinsamen Zeilen ausgeben." +msgstr "" +"-l, --left-column Nur linke Spalte der gemeinsamen Zeilen " +"ausgeben." -#: src/sdiff.c:184 -#, fuzzy +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Keine gemeinsamen Zeilen ausgeben." +msgstr "-s, --suppress-common-lines Keine gemeinsamen Zeilen ausgeben." -#: src/sdiff.c:186 -#, fuzzy +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t -expand-tabs Tabulatoren zu Leerzeichen in der Ausgabe ausdehnen." +msgstr "" +"-t, --expand-tabs Tabulatoren zu Leerzeichen in der Ausgabe " +"ausdehnen." -#: src/sdiff.c:187 -#, fuzzy +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" -msgstr "--tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten (Vorgabe: 8)." +msgstr "" +" --tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten " +"(Vorgabe: 8)." -#: src/sdiff.c:189 -#, fuzzy +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -"-d --minimal Aufwendig nach einem kleineren Satz von nderungen suchen." +"-d, --minimal Aufwendig nach einem kleineren Satz von " +"Änderungen suchen." -#: src/sdiff.c:190 -#, fuzzy +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H --speed-large-files Es werden groe Dateien und viele nderungen " -"vermutet." +"-H, --speed-large-files Es werden große Dateien und viele verstreute, " +"kleine\n" +" Änderungen vermutet." -#: src/sdiff.c:191 -#, fuzzy +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden." +" --diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Betrachte alle Dateien als Text." +msgstr " --help Diese Hilfe anzeigen und beenden." -#: src/sdiff.c:194 -#, fuzzy +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" -msgstr "-v -version Versionsinformation ausgeben." +msgstr "-v, -version Versionsinformation ausgeben und beenden." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Aufruf: %s [OPTION]... DATEI1 DATEI2\n" # XXX Was ist das? -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "" -"Nebeneinanderstehenden Zusammenbringen (side-by-side merge) der " -"Dateiunterschiede." +"Nebeneinanderstehendes Zusammenbringen der Unterschiede zwischen DATEI1 und " +"DATEI2." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "Kann nicht die Standardeingabe interaktiv mischen." -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "Beide zu vergleichenden Dateien sind Verzeichnisse." -#: src/sdiff.c:827 -#, fuzzy +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1427,17 +1450,34 @@ msgid "" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr "" -"ed:\\tEdieren, dann beide Versionen benutzen, jede mit einem Kopf " +"ed:\tEditieren, dann beide Versionen benutzen, jede mit einem Kopf " "dekoriert.\n" -"eb:\\tEdieren, dann beide Versionen benutzen.\n" -"el:\\tEdieren, dann linke Version benutzen.\n" -"er:\\tEdieren, dann rechte Version benutzen.\n" -"e:\\t Neue Version edieren.\n" -"l:\\tLinke Version benutzen.\n" -"r:\\tRechte Version benutzen.\n" -"s:\\tSchweigend gemeinsame Zeilen bernehmen.\n" -"v:\\tLauthals gemeinsame Zeilen bernehmen.\n" -"q:\\tBeenden.\n" +"eb:\tEditieren, dann beide Versionen benutzen.\n" +"el oder e1:\tEditieren, dann linke Version benutzen.\n" +"er oder e2:\tEditieren, dann rechte Version benutzen.\n" +"e:\tBeide Versionen verwerfen und dann eine neue Version editieren.\n" +"l:\tLinke Version benutzen.\n" +"r:\tRechte Version benutzen.\n" +"s:\tSchweigend gemeinsame Zeilen übernehmen.\n" +"v:\tLauthals gemeinsame Zeilen übernehmen.\n" +"q:\tBeenden.\n" + +#~ msgid "" +#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" +#~ "You may redistribute copies of this program\n" +#~ "under the terms of the GNU General Public License.\n" +#~ "For more information about these matters, see the file named COPYING." +#~ msgstr "" +#~ "Dieses Programm wird ohne Gewährleistung geliefert, soweit dies\n" +#~ "gesetzlich zulässig ist. Sie können es unter den Bedingungen der GNU\n" +#~ "General Public License weitergeben. \n" +#~ "Details dazu enthält die Datei COPYING." + +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: ungültige Option -- %c.\n" + +#~ msgid "Written by Torbjorn Granlund and David MacKenzie." +#~ msgstr "Geschrieben von Torbjorn Granlund und David MacKenzie." #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" @@ -1445,55 +1485,31 @@ msgstr "" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s -quiet --silent Keine Ausgabe; nur den Exit-Status setzen." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v -version Versionsinformation ausgeben." - #~ msgid "--help Output this help." #~ msgstr "--help Nur diese Hilfe zeigen." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Drei Dateien Zeile fr Zeile vergleichen." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion nderungen aufgrund von Tabausdehnungen " -#~ "ignorieren." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Fehlerberichte bitte an <bug-gnu-utils@gnu.org>." -#, fuzzy #~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Ignoriere nderungen im Leerraum." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W -ignore-all-space Leerraum ignorieren." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." +#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman, and Len Tower." #~ msgstr "" -#~ "-B, --ignore-blank-lines Die nderungen bergehen, wo die Zeilen leer " -#~ "sind." +#~ "Geschrieben von Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman und Len Tower." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Wagenrcklauf (CR) am Zeilenende beim Einlesen " -#~ "entfernen." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "Die Option »-%ld« ist veraltet; verwenden Sie »-%c %ld«." -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Betrachte alle Dateien als Text." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "Die Option »-%ld« ist veraltet; lassen Sie sie weg." -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1505,15 +1521,11 @@ msgstr "" #~ " (Vorgabe: 3).\n" #~ " --label LABEL LABEL statt Dateiname verwenden.\n" #~ " -p, --show-c-function Anzeigen, in welcher C-Funktion die " -#~ "Vernderung\n" +#~ "Veränderung\n" #~ " vorkommt.\n" -#~ " -F RE, --show-function-line=RE Die nchste Zeile anzeigen, auf die RE " +#~ " -F RE, --show-function-line=RE Die nächste Zeile anzeigen, auf die RE " #~ "zutrifft." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Ein ed-Skript ausgeben." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1526,132 +1538,25 @@ msgstr "" #~ " --left-column Nur linke Spalte gemeinsamer Zeilen ausgeben.\n" #~ " ---suppress-common-lines Keine gemeinsamen Zeilen ausgeben." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t -expand-tabs Tabulatoren zu Leerzeichen in der Ausgabe ausdehnen." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Einrckungen durch vorangestellte Tabulatoren erzeugen." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten (Vorgabe: 8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "" -#~ "-d --minimal Aufwendig nach einem kleineren Satz von nderungen suchen." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" -#~ "--speed-large-files Es werden groe Dateien und viele nderungen " +#~ "--speed-large-files Es werden große Dateien und viele Änderungen " #~ "vermutet." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Alle nderungen ausgeben, Konflikte in Klammern." - #~ msgid "-X Output overlapping changes, bracketing them." -#~ msgstr "-X berlappende nderungen geklammert ausgeben." +#~ msgstr "-X Überlappende Änderungen geklammert ausgeben." #~ msgid "-m --merge Output merged file instead of ed script (default -A)." #~ msgstr "" -#~ "-m --merge Zusammengefhrte Datei anstelle von ed-Skript ausgeben " +#~ "-m --merge Zusammengeführte Datei anstelle von ed-Skript ausgeben " #~ "(Vorgabe -A)." #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L LABEL --label=LABEL LABEL anstelle des Dateinamens verwenden." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W -ignore-all-space Leerraum ignorieren." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w ZAHL --width=ZAHL Maximal ZAHL Druckspalten pro Zeile (Vorgabe: 130)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Nur linke Spalte der gemeinsamen Zeilen ausgeben." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Es werden groe Dateien und viele nderungen " -#~ "vermutet." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "Lesefehler." - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "Schreibfehler." - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "Lesefehler." - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "Lesefehler." - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "Schreibfehler." - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "Schreibfehler." - -#~ msgid "" -#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" -#~ "You may redistribute copies of this program\n" -#~ "under the terms of the GNU General Public License.\n" -#~ "For more information about these matters, see the file named COPYING." -#~ msgstr "" -#~ "Dieses Programm wird ohne Gewhrleistung geliefert, soweit dies\n" -#~ "gesetzlich zulssig ist. Sie knnen es unter den Bedingungen der GNU\n" -#~ "General Public License weitergeben. \n" -#~ "Details dazu enthlt die Datei COPYING." - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: ungltige Option -- %c.\n" - -#~ msgid "Written by Torbjorn Granlund and David MacKenzie." -#~ msgstr "Geschrieben von Torbjorn Granlund und David MacKenzie." - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Fehlerberichte bitte an <bug-gnu-utils@gnu.org>." - -#~ msgid "" -#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman, and Len Tower." -#~ msgstr "" -#~ "Geschrieben von Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman und Len Tower." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "Die Option -%ld ist veraltet; verwenden Sie -%c %ld." - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "Die Option -%ld ist veraltet; lassen Sie sie weg." - #~ msgid "subsidiary program `%s' failed" -#~ msgstr "Unterprogramm %s schlug fehl." +#~ msgstr "Unterprogramm »%s« schlug fehl." #~ msgid "subsidiary program `%s' not executable" -#~ msgstr "Unterprogramm %s ist nicht ausfhrbar." +#~ msgstr "Unterprogramm »%s« ist nicht ausführbar." diff --git a/po/diffutils.pot b/po/diffutils.pot index 6f674e1..2535f9e 100644 --- a/po/diffutils.pot +++ b/po/diffutils.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.2\n" +"Project-Id-Version: GNU diffutils 3.3\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\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" @@ -25,7 +25,7 @@ msgstr "" msgid "stack overflow" msgstr "" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "" @@ -138,100 +138,102 @@ msgstr "" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "" @@ -262,17 +264,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" +msgid "invalid suffix in %s%s argument '%s'" msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -423,7 +425,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "" @@ -433,7 +435,7 @@ msgstr "" msgid "Binary files %s and %s differ\n" msgstr "" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "" @@ -447,14 +449,14 @@ msgstr "" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." +msgid "Try '%s --help' for more information." msgstr "" #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" +msgid "invalid --ignore-initial value '%s'" msgstr "" #: src/cmp.c:147 @@ -462,14 +464,14 @@ msgstr "" msgid "options -l and -s are incompatible" msgstr "" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "" @@ -523,7 +525,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "" -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -536,26 +538,26 @@ msgid "" msgstr "" #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +msgid "If a FILE is '-' or missing, read standard input." msgstr "" -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" +msgid "invalid --bytes value '%s'" msgstr "" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" +msgid "missing operand after '%s'" msgstr "" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" +msgid "extra operand '%s'" msgstr "" #: src/cmp.c:491 @@ -574,274 +576,278 @@ msgid "cmp: EOF on %s\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" +msgid "invalid context length '%s'" msgstr "" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" +msgid "invalid width '%s'" msgstr "" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" +msgid "invalid horizon length '%s'" msgstr "" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" +msgid "invalid tabsize '%s'" msgstr "" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr "" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr "" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -#: src/diff.c:889 +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr "" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -857,7 +863,7 @@ msgid "" " %(A=B?T:E) if A equals B then T else E" msgstr "" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -865,7 +871,7 @@ msgid "" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -874,84 +880,89 @@ msgid "" " C the character C (other characters represent themselves)" msgstr "" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." msgstr "" -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "" -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" +msgid "conflicting %s option value '%s'" msgstr "" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" msgstr "" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "" @@ -967,11 +978,11 @@ msgid "incompatible options" msgstr "" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +msgid "'-' specified for more than one input file" msgstr "" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "" @@ -1005,7 +1016,7 @@ msgid "-X like -x, but bracket conflicts" msgstr "" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" #: src/diff3.c:438 @@ -1088,30 +1099,30 @@ msgstr "" msgid "invalid diff format; invalid change separator" msgstr "" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr "" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" +msgid "cannot compare file names '%s' and '%s'" msgstr "" #: src/dir.c:209 @@ -1124,107 +1135,111 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -#: src/sdiff.c:174 +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" msgstr "" -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils-2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-12-28 15:50+0000\n" "Last-Translator: Lefteris Dimitroulakis <edimitro@tee.gr>\n" "Language-Team: Greek <nls@tux.hellug.gr>\n" @@ -26,7 +26,7 @@ msgstr "σφάλμα προγράμματος" msgid "stack overflow" msgstr "υπερχείλιση στοίβας" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Άγνωστο σφάλμα συστήματος" @@ -139,100 +139,102 @@ msgstr "%s: η επιλογή «%s» απαιτεί όρισμα\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Επιτυχία" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Δεν υπάρχει ταίριασμα" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Άκυρη κανονική έκφραση" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Άκυρος χαρακτήρας διαταξινόμησης" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Άκυρο όνομα κλάσεως χαρακτήρων" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Αντιπλαγία στο τέλος" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Άκυρη πίσω παραπομπή" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Δε βρέθηκε [ ή [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Δε βρέθηκε ( ή \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Δε βρέθηκε \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Το περιεχόμενο του \\{\\} είναι άκυρο" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Άκυρο πέρας διαστήματος" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Η μνήμη εξαντλήθηκε" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Η προηγούμενη κανονική έκφραση είναι άκυρη" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Πρόωρο τέλος κανονικής έκφρασης" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Πολύ μεγάλη κανονική έκφραση" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Δε βρέθηκε ) ή \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Δεν προηγήθηκε κανονική έκφραση" @@ -264,17 +266,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "άκυρη τιμή «%s» για την επιλογή --bytes " #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "άκυρο μήκος ορίζοντα «%s»" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -442,7 +444,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Τα αρχεία %s και %s διαφέρουν\n" @@ -452,7 +454,7 @@ msgstr "Τα αρχεία %s και %s διαφέρουν\n" msgid "Binary files %s and %s differ\n" msgstr "Τα αρχεία %s και %s διαφέρουν\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου" @@ -466,14 +468,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Δοκιμάστε `%s --help' για περισσότερες πληροφορίες." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "άκυρη τιμή --ignore-initial `%s'" #: src/cmp.c:147 @@ -481,14 +483,14 @@ msgstr "άκυρη τιμή --ignore-initial `%s'" msgid "options -l and -s are incompatible" msgstr "οι επιλογές -l και -s είναι ασύμβατες" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "η εγγραφή απέτυχε" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "κανονική έξοδος" @@ -553,7 +555,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "SKIP1 και SKIP2 είναι ο αριθμός των byte προς παράλειψη ανά αρχείο." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -570,28 +572,29 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, κτλ γιά T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Αν ένα ΑΡΧΕΙΟ είναι `-' ή απών, τότε ανάγνωση από την κανονική είσοδο." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Η έξοδος είναι 0 αν τα δεδομένα αρχεία είναι ίδια, 1 αν είναι διαφορετικά,\n" "2 αν υπάρχει πρόβλημα." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "άκυρη τιμή «%s» για την επιλογή --bytes " -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "απών τελεστέος μετά από «%s»" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "συμπληρωματικός τελεστέος «%s»" #: src/cmp.c:491 @@ -610,214 +613,215 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: Τέλος-Αρχείου (EOF) σε %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "άκυρο μήκος συμφραζομένων «%s»" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "Η αρίθμιση σελίδων δεν υποστηρίζεται σ' αυτόν τον υπολογιστή" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "πάρα πολλές επιλογές ετικέτας αρχείου" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "άκυρο πλάτος «%s»" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "αντικρουόμενες επιλογές πλάτους" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "άκυρο μήκος ορίζοντα «%s»" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "άκυρο μήκος στηλοθέτησης `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "αντικρουόμενες επιλογές μήκους στηλοθέτησης" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file και --to-file έχουν οριστεί μαζί" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Δημιουργία ενός `diff' σε κανονική μορφή." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Έξοδος μόνο όταν τα αρχεία διαφέρουν." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Ειδοποιεί όταν δύο αρχεία είναι ίδια." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w ΑΡ --width=ΑΡ Έξοδος με το πολύ ΑΡ στήλες εκτύπωσης (προεπιλογή 130)." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w ΑΡ --width=ΑΡ Έξοδος με το πολύ ΑΡ στήλες εκτύπωσης (προεπιλογή 130)." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Θεωρεί όλα τα αρχεία ως κείμενο." +msgstr "-e --ed Δημιουργία προγράμματος εντολών για τον `ed'." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Δημιουργία αρχείου `diff' σε μορφή RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Έξοδος ονόματος κι έκδοσης." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w ΑΡ --width=ΑΡ Έξοδος με το πολύ ΑΡ στήλες εκτύπωσης (προεπιλογή 130)." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "" "-l --left-column Εμφάνιση στην αριστερή στήλη των ταυτόσημων γραμμών." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Οι ταυτόσημες γραμμές δεν εμφανίζονται." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Μετατροπή στηλοθετών σε διαστήματα στην έξοδο." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Στοίχιση των στηλοθετών με την επιπρόσθεση ενός στην αρχή." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" "--tabsize=ΑΡ Ο αριθμός διαστημάτων του στηλοθέτη είναι ΑΡ (προεπιλογή 8)." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate Έξοδος δια μέσου του `pr' ώστε να αριθμιθούν οι σελίδες." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Αναδρομική σύγκριση όσων υποκαταλόγων βρεθούν." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Θεωρεί τα απόντα αρχεία ως κενά." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Θεωρεί τα απόντα πρώτα αρχεία ως κενά." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Αγνοεί τις διαφορές λόγω πεζών-κεφαλαίων\n" " κατά τη σύγκριση ονομάτων αρχείων." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Λαμβάνει υπ' όψιν τις διαφορές λόγω\n" " πεζών-κεφαλαίων κατά τη σύγκριση ονομάτων αρχείων." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Εξαίρεση αρχείων με όνομα που ταιριάζει με PAT." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -825,7 +829,7 @@ msgstr "" "-X ΑΡΧΕΙΟ --exclude-from=ΑΡΧΕΙΟ Εξαίρεση αρχείων με όνομα που ταιράζει\n" " με τα ονόματα που βρίσκονται στο ΑΡΧΕΙΟ." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -833,7 +837,7 @@ msgstr "" "-S ΑΡΧΕΙΟ --starting-file=ΑΡΧΕΙΟ Εκκίνηση σύγκρισης καταλόγων από το " "ΑΡΧΕΙΟ." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -843,7 +847,7 @@ msgstr "" " Σύγκριση ΑΡΧΕΙΟ1 με όλους τους τελεστέους.\n" " ΑΡΧΕΙΟ1 μπορεί να είναι κατάλογος." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -853,7 +857,7 @@ msgstr "" " Σύγκριση όλων των τελεστέων στο ΑΡΧΕΙΟ2.\n" " ΑΡΧΕΙΟ2 μπορεί να είναι κατάλογος." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" @@ -861,99 +865,100 @@ msgstr "" "-i --ignore-case Αγνοεί τις διαφορές λόγω πεζών-κεφαλαίων\n" "στα περιεχόμενα αρχείων." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Αγνοεί αλλαγές οφειλόμενες στη στηλοθέτηση." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Αγνοεί αλλαγές οφειλόμενες στα λευκά διαστήματα." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines Αγνοεί αλλαγές οφειλόμενες στις λευκές γραμμές." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Αγνοεί αλλαγές που οι γραμμές τους " "ταιριάζουν με RE." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Θεωρεί όλα τα αρχεία ως κείμενο." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Ανάγνωση και εγγραφή πληροφορίας σε δυαδική μορφή." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D ΟΝΟΜΑ --ifdef=ΟΝΟΜΑ Έξοδος συγχωνευμένου αρχείου\n" "με τις διαφορές `#ifdef NAME'." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Αντίστοιχο, αλλά μορφοποίηση ομάδων\n" " εισόδου GTYPE με GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT Αντίστοιχο, αλλά μορφοποίηση\n" "όλων των γραμμών εισόδου με LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Αντίστοιχο, αλλά μορφοποίηση \n" "γραμμών εισόδου LTYPE με LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE είναι `old', `new', ή `unchanged'. GTYPE είναι LTYPE ή `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -982,7 +987,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -996,7 +1001,7 @@ msgstr "" " %[-][ΠΛΑΤΟΣ][.[PREC]]{doxX}n την προδιαγραφή του αριθμού γραμμής\n" " εισόδου ανάλογα με τη μορφή της printf()" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1010,19 +1015,19 @@ msgstr "" " %c'C' τον ίδιο το χαρακτήρα C\n" " %c'\\OOO' το χαρακτήρα με οκταδικό κωδικό OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal Αν είναι δυνατόν εμφάνιση του μικρότερου συνόλου διαφορών." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=ΑΡ Διατηρεί ΑΡ γραμμές με ταυτόσημα προθέματα κι επιθέματα." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1030,23 +1035,24 @@ msgstr "" "-H --speed-large-files Υποθέτει μεγάλα αρχεία με πολλές σκόρπιες " "μικροαλλαγές." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Έξοδος ονόματος κι έκδοσης." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "ΑΡΧΕΙΑ είναι `ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2' ή `ΚΑΤ1 ΚΑΤ2' ή `ΚΑΤ ΑΡΧΕΙΟ...' ή `ΑΡΧΕΙΟ... " "ΚΑΤ'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." @@ -1054,54 +1060,61 @@ msgstr "" "Αν το --from-file ή --to-file είναι δεδομένο, τότε δεν υπάρχει περιορισμός " "στα ΑΡΧΕΙΑ." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Αν ένα ΑΡΧΕΙΟ είναι `-', τότε ανάγνωση από την τυπική είσοδο." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΑ\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Σύγκριση αρχείων γραμμή προς γραμμή." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "η επιλογή %s είναι αντικρουόμενη με την τιμή «%s»" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "αντικρουόμενες επιλογές για τη μορφή εξόδου" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Μόνο στο %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "Αδύνατη η σύγκριση του `-' με ένα κατάλογο" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "Η επιλογή -D δεν υποστηρίζεται για καταλόγους." -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Οι υποκατάλογοι %s και %s είναι ταυτόσημοι\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Το αρχείο %s είναι %s ενώ το αρχείο %s είναι %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Τα αρχεία %s και %s διαφέρουν\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Τα αρχεία %s καί %s είναι πανομοιότυπα\n" @@ -1117,11 +1130,12 @@ msgid "incompatible options" msgstr "ασύμβατες επιλογές" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' ορίστηκε για περισσότερα από ένα αρχεία εισόδου" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "αποτυχία ανάγνωσης" @@ -1157,13 +1171,12 @@ msgid "" msgstr "-x --overlap-only Έξοδος μόνο των αλλαγών που επικαλύπτονται." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap Έξοδος ασυγχώνευτων αλλαγών σε αγκύλες." +msgstr "" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Προσάρτηση των διαταγών `w' και `q' στα σενάρια του `ed'." #: src/diff3.c:438 @@ -1200,9 +1213,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Θεωρεί όλα τα αρχεία ως κείμενο." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1253,30 +1265,30 @@ msgstr "εσωτερικό σφάλμα: άκυρος τύπος `diff' στο p msgid "invalid diff format; invalid change separator" msgstr "άκυρη μορφή `diff': άκυρος οριοθέτης αλλαγής" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "άκυρη μορφή `diff': ασυμπλήρωτη τελευταία γραμμή" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "το υποπρόγραμμα «%s» δεν ήταν δυνατόν να κληθεί" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "άκυρη μορφή `diff': λάθος χαρακτήρες στη γραμμή αποτελεσμάτων" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "εσωτερικό σφάλμα: άκυρος τύπος `diff' πέρασε στην έξοδο" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "Το αρχείο εισόδου συρρικνώθηκε" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "αδύνατη η σύγκριση των ονομάτων αρχείων «%s» και «%s»" #: src/dir.c:209 @@ -1289,7 +1301,7 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" @@ -1297,89 +1309,96 @@ msgstr "" "-o ΑΡΧΕΙΟ --output=ΑΡΧΕΙΟ Αλληλεπιδραστική λειτουργία\n" " με αποστολή εξόδου στο ΑΡΧΕΙΟ." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Θεωρεί πεζά-κεφαλαία ίδια." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Αγνοεί αλλαγές οφειλόμενες στη στηλοθέτηση." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Αγνοεί αλλαγές οφειλόμενες στα λευκά διαστήματα." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." +msgstr "-W --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B --ignore-blank-lines Αγνοεί αλλαγές οφειλόμενες στις λευκές γραμμές." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE Αγνοεί αλλαγές που οι γραμμές τους " +"ταιριάζουν με RE." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Θεωρεί όλα τα αρχεία ως κείμενο." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w ΑΡ --width=ΑΡ Έξοδος με το πολύ ΑΡ στήλες εκτύπωσης (προεπιλογή 130)." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l --left-column Εμφάνιση στην αριστερή στήλη των ταυτόσημων γραμμών." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Οι ταυτόσημες γραμμές δεν εμφανίζονται." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Μετατροπή στηλοθετών σε διαστήματα στην έξοδο." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" "--tabsize=ΑΡ Ο αριθμός διαστημάτων του στηλοθέτη είναι ΑΡ (προεπιλογή 8)." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal Αν είναι δυνατόν εμφάνιση του μικρότερου συνόλου διαφορών." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1387,40 +1406,39 @@ msgstr "" "-H --speed-large-files Υποθέτει μεγάλα αρχεία με πολλές σκόρπιες " "μικροαλλαγές." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=ΠΡΟΓΡ Χρήση του ΠΡΟΓΡάμματος στη σύγκριση αρχείων." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Θεωρεί όλα τα αρχεία ως κείμενο." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Έξοδος ονόματος κι έκδοσης." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Συγχώνευση δίπλα-δίπλα των διαφορών του αρχείου." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "αδυνατώ να συγχωνεύσω αλληλεπιδραστικά την πρότυπη είσοδο." -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "και τα δύο προς σύγκριση αρχεία είναι κατάλογοι" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1446,6 +1464,20 @@ msgstr "" "v:\tΣυμπεριλαμβάνει τις ταυτόσημες γραμμές και το επισημαίνει.\n" "q:\tΈξοδος.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: η επιλογή -- %c είναι παράτυπη\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" @@ -1453,53 +1485,24 @@ msgstr "" #~ msgstr "" #~ "-s --quiet --silent Ουδεμία έξοδος, μόνο μήνυμα πέρατος εκτέλεσης." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Έξοδος ονόματος κι έκδοσης." - #~ msgid "--help Output this help." #~ msgstr "--help Έξοδος αυτής εδώ της βοήθειας." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Σύγκριση τριών αρχείων γραμμή προς γραμμή." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Αγνοεί αλλαγές οφειλόμενες στη στηλοθέτηση." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Αγνοεί αλλαγές οφειλόμενες στα λευκά " -#~ "διαστήματα." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Αγνοεί αλλαγές οφειλόμενες στις λευκές γραμμές." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Αναφέρατε σφάλματα στη <bug-gnu-utils@gnu.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Απαλειφή του χαρακτήρα επιστροφής στην είσοδο." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "η επιλογή «-%ld» έχει καταργηθεί, χρησιμοποιείστε την «-%c %ld»" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Θεωρεί όλα τα αρχεία ως κείμενο." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "η επιλογή «-%ld» έχει καταργηθεί, παραλείψτε την " -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1513,10 +1516,6 @@ msgstr "" #~ "-F RE --show-function-line=RE Δείχνει την πιο πρόσφατη γραμμή\n" #~ " που ταιριάζει με τη RE." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Δημιουργία προγράμματος εντολών για τον `ed'." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1529,36 +1528,12 @@ msgstr "" #~ " --left-column Έξοδος μόνο αριστερής στήλης με τις ταυτόσημες γραμμές.\n" #~ " --suppress-common-lines Δεν εμφανίζει τις ταυτόσημες γραμμές." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Μετατροπή στηλοθετών σε διαστήματα στην έξοδο." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Στοίχιση των στηλοθετών με την επιπρόσθεση ενός στην " -#~ "αρχή." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=ΑΡ Ο αριθμός διαστημάτων του στηλοθέτη είναι ΑΡ (προεπιλογή 8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "" -#~ "-d --minimal Αν είναι δυνατόν εμφάνιση του μικρότερου συνόλου διαφορών." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Υποθέτει μεγάλα αρχεία και πολλές σκόρπιες " #~ "μικροαλλαγές." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Έξοδος όλων των αλλαγών σε αγκύλες." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Έξοδος των αλλαγών που επικαλύπτονται, σε αγκύλες." @@ -1570,79 +1545,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L ΕΤΙΚ --label=ΕΤΙΚ Χρήση ΕΤΙΚέτας αντί του ονόματος αρχείου." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=ΠΡΟΓΡ Χρήση του ΠΡΟΓΡάμματος στη σύγκριση αρχείων." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w ΑΡ --width=ΑΡ Έξοδος με το πολύ ΑΡ στήλες εκτύπωσης (προεπιλογή 130)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Εμφάνιση στην αριστερή στήλη των ταυτόσημων γραμμών." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Υποθέτει μεγάλα αρχεία και πολλές σκόρπιες " -#~ "μικροαλλαγές." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "αποτυχία ανάγνωσης" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "η εγγραφή απέτυχε" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "αποτυχία ανάγνωσης" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "αποτυχία ανάγνωσης" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "η εγγραφή απέτυχε" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "η εγγραφή απέτυχε" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: η επιλογή -- %c είναι παράτυπη\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Αναφέρατε σφάλματα στη <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "η επιλογή «-%ld» έχει καταργηθεί, χρησιμοποιείστε την «-%c %ld»" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "η επιλογή «-%ld» έχει καταργηθεί, παραλείψτε την " - #~ msgid "subsidiary program `%s' not found" #~ msgstr "Δε βρέθηκε το βοηθητικό πρόγραμμα <%s>" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-05-22 15:31+0100\n" "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "programeraro" msgid "stack overflow" msgstr "stako tro granda" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Nekonata sistemeraro" @@ -136,100 +136,102 @@ msgstr "%s opcio '%s' postulas argumenton\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sukceso" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nenia trafo" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Nevalida regula esprimo" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Nevalida ordiga signo" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nevalida nomo de signoklaso" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "'\\' ĉe la fino" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Nevalida retroreferenco" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Neparigita [ aŭ [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Neparigita ( aŭ \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Neparigita \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Nevalida kunteksto de \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Nevalida fino de gamo" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoro elĉerpiĝis" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Nevalida antaŭa regula esprimo" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Neatendita fino de regula esprimo" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regula esprimo estas tro granda" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Neparigita ) aŭ \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Mankas antaŭa regula esprimo" @@ -261,17 +263,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "nevalida valoro '%s' de --bytes" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "nevalida horizonta longo '%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -439,7 +441,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Dosieroj %s kaj %s estas malsamaj\n" @@ -449,7 +451,7 @@ msgstr "Dosieroj %s kaj %s estas malsamaj\n" msgid "Binary files %s and %s differ\n" msgstr "Dosieroj %s kaj %s estas malsamaj\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Mankas linifino ĉe fino de dosiero" @@ -463,14 +465,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Provu '%s --help' por pli da informoj." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "nevalida valoro '%s' de --ignore-initial" #: src/cmp.c:147 @@ -478,14 +480,14 @@ msgstr "nevalida valoro '%s' de --ignore-initial" msgid "options -l and -s are incompatible" msgstr "opcioj -l kaj -s malkongruas" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "skriberaro" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "normala eligo" @@ -548,7 +550,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "N1 kaj N2 estas la nombro de bitokoj ignorendaj en ĉiu dosiero." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -564,27 +566,28 @@ msgstr "" "GB 1 000 000 000, G 1 073 741 824, kaj tiel plu por T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Se DOSIERO estas '-' aŭ mankas, legi la normalan enigon." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Elig-valoro estas 0, se enigoj estas samaj, 1, se malsamaj, 2 se problemo." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "nevalida valoro '%s' de --bytes" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "argumento mankas post '%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "kroma argumento '%s'" #: src/cmp.c:491 @@ -603,207 +606,209 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF ĉe %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "nevalida longo '%s' de kunteksto" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "dispaĝigo ne eblas kun ĉi tiu sistemo" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "tro da dosieretikedopcioj" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "nevalida larĝo '%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "malkongruaj opcioj pri larĝo" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "nevalida horizonta longo '%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "nevalida TAB-larĝo '%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "malkongruaj opcioj pri TAB-larĝo" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file kaj --to-file ambaŭ specifitaj" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Eligi normalan diferencaron." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Eligi nur, ĉu la dosieroj estas malsamaj." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Raporti, kiam du dosieroj estas samaj." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr "-w NOM --width=NOM Eligi maksimume NOM (implicite 130) kolumnojn." +msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w NOM --width=NOM Eligi maksimume NOM (implicite 130) kolumnojn." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Trakti ĉiujn dosierojn kiel tekstajn." +msgstr "-e --ed Eligi ed-programeton." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Eligi diferencaron en RCS-formo." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Eligi informojn pri la versio." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NOM --width=NOM Eligi maksimume NOM (implicite 130) kolumnojn." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "" "-l --left-column Montri nur la maldekstran kolumnon de komunaj linioj." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Ne eligi komunajn liniojn." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Konverti TABojn al spacetoj en la eligo." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Ĝustigi TABojn per antaŭmetado de spaceto." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NOM TAB-lokoj estas post ĉiuj NOM (implicite 8) kolumnoj." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Pasigi la eligon tra 'pr' por enpaĝigi ĝin." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Rekurse kompari trovitajn subdosierujojn." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Trakti mankantajn dosierojn kiel malplenajn." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Trakti mankantajn unuajn dosierojn kiel " "malplenajn." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Ignori usklecon en komparado de dosiernomoj." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Konsideri usklecon en komparado de dosiernomoj." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x ŜAB --exclude=ŜAB Ignori dosierojn, kiuj kongruas kun ŜABlono." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -811,14 +816,14 @@ msgstr "" "-X DOS --exclude-from=DOS Ignori dosierojn, kiuj kongruas kun iu ŝablono " "en DOSiero." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S DOS --starting-file=DOS Komenci per DOSiero, komparante dosierujojn." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -827,7 +832,7 @@ msgstr "" "--from-file=DOS1 Kompari DOS1 kun ĉiuj argumentoj. DOS1 povas esti " "dosierujo." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -836,98 +841,99 @@ msgstr "" "--to-file=DOS2 Kompari ĉiujn argumentoj kun DOS2. DOS2 povas esti " "dosierujo." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Ignori diferencojn en uskleco en dosierenhavo." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Ignori ŝanĝojn kaŭzatajn de TAB-oj." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignori ĉian blankan spacon." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignori ŝanĝojn en blanka spaco." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignori ĉian blankan spacon." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Ignori ŝanĝojn, kies linioj estas malplenaj." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Ignori ŝanĝojn, kies linioj ĉiuj kongruas " "kun RE." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Trakti ĉiujn dosierojn kiel tekstajn." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Forigi linifinan CR ĉe enigo." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Legi kaj skribi datenojn binare." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NOMO --ifdef=NOMO Eligi kunfanditan dosieron por montri '#ifdef NOMO'-" "diferencojn." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Simile, sed montri GTYPE-enig-grupojn per GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT Simile, sed montri ĉiujn enigliniojn per LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Simile, sed montri LTYPE-enig-grupojn per LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE estas 'old', 'new' aŭ 'unchanged'. GTYPE estas LTYPE aŭ 'changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -955,7 +961,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -968,7 +974,7 @@ msgstr "" " %l enhavo linio, sen eventuala linifino\n" " %[-][LARĜO][.[PREC]]{doxX}n printf-stila specifo de lininumero" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -982,18 +988,18 @@ msgstr "" " %c'C' la unuopa signo C\n" " %c'\\000' la signo kun okuma kodo OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Pene serĉi malpli grandan aron da ŝanĝoj." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=NOM Gardi NOM liniojn de la komuna prefikso kaj sufikso." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1001,77 +1007,85 @@ msgstr "" "-H --speed-large-files Atendi grandajn dosierojn kaj multajn disajn " "ŝanĝetojn." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Eligi informojn pri la versio." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "DOSIEROJ estas 'DOSIERO1 DOSIERO2' aŭ 'DOSIERUJO1 DOSIERUJO2' aŭ DOSIERUJO " "DOSIERO...' aŭ 'DOSIERO... DOSIERUJO'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se --from-file aŭ --to-file estas donita, ne estas limigoj de DOSIEROJ." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Se DOSIERO estas '-', legi la normalan enigon." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uzado: %s [OPCIO]... DOSIEROJ\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Kompari dosierojn linion post linio." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "malkongrua valoro de opcio %s: '%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "malkongruaj opcioj pri eligostilo" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Nur en %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "ne povas kompari '-' kun dosierujo" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "opcio -D ne eblas kun dosierujoj" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Komunaj subdosierujoj: %s kaj %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Dosiero %s estas %s, dum dosiero %s estas %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Dosieroj %s kaj %s estas malsamaj\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Dosieroj %s kaj %s estas samaj\n" @@ -1087,11 +1101,12 @@ msgid "incompatible options" msgstr "malkongruaj opcioj" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "'-' donita por pli ol unu enigdosiero" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "legeraro" @@ -1129,15 +1144,12 @@ msgid "" msgstr "-x --overlap-only Eligi interkovriĝantajn ŝanĝojn." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Eligi nekunfanditajn ŝanĝojn, kun konfliktoj en " -"parentezoj." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Aldoni la komandojn 'w' kaj 'q' al ed-programetoj." #: src/diff3.c:438 @@ -1173,9 +1185,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Trakti ĉiujn dosierojn kiel tekstajn." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1226,30 +1237,30 @@ msgstr "interna eraro: nevalida diff-speco en process_diff" msgid "invalid diff format; invalid change separator" msgstr "nevalida diff-formato; nevalida ŝanĝ-apartigilo" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "nevalida diff-formato; malkompleta lasta linio" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "ne povis alvoki la subprogramon '%s'" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "nevalida diff-formato; malĝusta signo en antaŭa linio" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "interna eraro: nevalida diff-speco donita al eligo" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "enigdosiero ŝrumpis" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "ne povas kompari dosiernomojn '%s' kaj '%s'" #: src/dir.c:209 @@ -1262,89 +1273,96 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o DOS --output=DOS Funkcii interage, sendante eligon al DOSiero." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Trakti majusklojn kaj minusklojn kiel samajn." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Ignori ŝanĝojn kaŭzatajn de TAB-oj." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignori ĉian blankan spacon." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignori ŝanĝojn en blanka spaco." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignori ĉian blankan spacon." +msgstr "-W --ignore-all-space Ignori ĉian blankan spacon." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Ignori ŝanĝojn, kies linioj estas malplenaj." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE Ignori ŝanĝojn, kies linioj ĉiuj kongruas " +"kun RE." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Forigi linifinan CR ĉe enigo." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Trakti ĉiujn dosierojn kiel tekstajn." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NOM --width=NOM Eligi maksimume NOM (implicite 130) kolumnojn." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l --left-column Montri nur la maldekstran kolumnon de komunaj linioj." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Ne eligi komunajn liniojn." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Konverti TABojn al spacetoj en la eligo." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=NOM TAB-lokoj estas post ĉiuj NOM (implicite 8) kolumnoj." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Pene serĉi malpli grandan aron da ŝanĝoj." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1352,40 +1370,39 @@ msgstr "" "-H --speed-large-files Atendi grandajn dosierojn kaj multajn disajn " "ŝanĝetojn." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAMO Uzi PROGRAMOn por kompari dosierojn." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Trakti ĉiujn dosierojn kiel tekstajn." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Eligi informojn pri la versio." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Uzado: %s [OPCIO]... DOSIERO1 DOSIERO2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Ĉeflanka kunfando de dosierodiferencoj." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "ne povas interage kunfandi la normalan enigon" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "ambaŭ komparendaj dosieroj estas dosierujoj" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1410,56 +1427,43 @@ msgstr "" "v:\tlaŭte transpreni komunajn liniojn\n" "q:\tfini\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: nepermesita opcio -- %c.\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Ĉi tio estas libera programo; vidu la fonton por kopi-kondiĉoj. Estas\n" +#~ "NENIA GARANTIO; eĉ ne por KOMERCA KVALITO aŭ ADEKVATECO POR DIFINITA " +#~ "CELO.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i N1:N2 --ignore-initial=N1:N2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent Eligi nenion; doni nur elig-valoron." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Eligi informojn pri la versio." - #~ msgid "--help Output this help." #~ msgstr "--help Montri ĉi tiun helpon." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Kompari tri dosierojn linion post linio." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion Ignori ŝanĝojn kaŭzatajn de TAB-oj." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Ignori ŝanĝojn en blanka spaco." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignori ĉian blankan spacon." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Ignori ŝanĝojn, kies linioj estas malplenaj." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Raportu pri cimoj al <bug-gnu-utils@gnu.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Forigi linifinan CR ĉe enigo." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "opcio '-%ld' estas malnova; uzu '-%c %ld'" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Trakti ĉiujn dosierojn kiel tekstajn." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "opcio '-%ld' estas malnova; ellasu ĝin" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1472,10 +1476,6 @@ msgstr "" #~ " -F RE -show-function-line=RE Montri la plej lastan linion, kiu " #~ "kongruas kun RE." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Eligi ed-programeton." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1488,33 +1488,12 @@ msgstr "" #~ " --left-column Eligi nur la maldekstran kolumnon de komunaj linioj.\n" #~ " --suppress-common-lines Ne eligi komunajn liniojn." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Konverti TABojn al spacetoj en la eligo." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Ĝustigi TABojn per antaŭmetado de spaceto." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NOM TAB-lokoj estas post ĉiuj NOM (implicite 8) kolumnoj." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Pene serĉi malpli grandan aron da ŝanĝoj." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Atendi grandajn dosierojn kaj multajn disajn " #~ "ŝanĝetojn." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Eligi ĉiujn ŝanĝojn, kun konfliktoj en parentezoj." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Eligi interkovriĝantajn ŝanĝojn, en parentezoj." @@ -1526,77 +1505,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L ETIK --label=ETIK Uzi ETIKedon anstataŭ la dosiernomo." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAMO Uzi PROGRAMOn por kompari dosierojn." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignori ĉian blankan spacon." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "-w NOM --width=NOM Eligi maksimume NOM (implicite 130) kolumnojn." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Montri nur la maldekstran kolumnon de komunaj linioj." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Atendi grandajn dosierojn kaj multajn disajn " -#~ "ŝanĝetojn." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "legeraro" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "skriberaro" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "legeraro" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "legeraro" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "skriberaro" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "skriberaro" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: nepermesita opcio -- %c.\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Ĉi tio estas libera programo; vidu la fonton por kopi-kondiĉoj. Estas\n" -#~ "NENIA GARANTIO; eĉ ne por KOMERCA KVALITO aŭ ADEKVATECO POR DIFINITA " -#~ "CELO.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Raportu pri cimoj al <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "opcio '-%ld' estas malnova; uzu '-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "opcio '-%ld' estas malnova; ellasu ĝin" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "subprogramo '%s' ne trovita" @@ -1,15 +1,15 @@ # Mensajes en español para GNU diffutils. -# Copyright (C) 1996, 2001, 2002, 2004, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 2001, 2002, 2004, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # Iñaky Pérez González <inaky@peloncho.fis.ucm.es>, 1996. -# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002, 2004, 2009, 2010, 2011. +# Santiago Vila Doncel <sanvila@unex.es>, 2001, 2002, 2004, 2009, 2010, 2011, 2013. # msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.1-pre1\n" +"Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-08-08 00:55+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2013-02-19 00:30+0100\n" "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n" "Language-Team: Spanish <es@li.org>\n" "Language: es\n" @@ -25,7 +25,7 @@ msgstr "error del programa" msgid "stack overflow" msgstr "desbordamiento de pila" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Error del sistema desconocido" @@ -144,55 +144,57 @@ msgstr "%s: la opción '-W %s' requiere un argumento\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "«" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "»" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Conseguido" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "No hay ninguna coincidencia" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Expresión regular inválida" # Se refiere probablemente a cosas tales como que la c con la h es "ch", # aunque este ejemplo ya no es válido, pues la Real Academia dice # que para propósitos de ordenación son letras independientes. -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carácter de unión inválido" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Carácter de clase inválido" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barra invertida al final" @@ -238,51 +240,51 @@ msgstr "Barra invertida al final" # no estoy dispuesto a matar por ello... sv # :) Gracias, pero por ahora dejaré retro-referencia, me parece más clara # en cuanto al significado preciso de la frase. ipg -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Retro-referencia inválida" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ ó [^ desemparejados" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( ó \\( desemparejado" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ desemparejado" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "El contenido de \\{\\} no es válido" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Final de rango inválido" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria agotada" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Expresión regular precedente inválida" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Final prematuro de la expresión regular" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "La expresión regular es demasiado grande" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") ó \\) desemparejado" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "No hay ninguna expresión regular previa" @@ -313,17 +315,17 @@ msgstr "fallo al reabrir %s con modo %s" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" -msgstr "argumento de %s%s inválido `%s'" +msgid "invalid %s%s argument '%s'" +msgstr "argumento de %s%s inválido '%s'" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "sufijo inválido en el argumento de %s%s `%s'" +msgid "invalid suffix in %s%s argument '%s'" +msgstr "sufijo inválido en el argumento de %s%s '%s'" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "%s%s argumento '%s' demasiado grande" #: lib/version-etc.c:74 @@ -502,7 +504,7 @@ msgstr "" "Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/" ">\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Los ficheros %s y %s son distintos\n" @@ -512,7 +514,7 @@ msgstr "Los ficheros %s y %s son distintos\n" msgid "Binary files %s and %s differ\n" msgstr "Los ficheros binarios %s y %s son distintos\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "No hay ningún carácter de nueva línea al final del fichero" @@ -526,29 +528,29 @@ msgstr "Torbjörn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Pruebe `%s --help' para más información." +msgid "Try '%s --help' for more information." +msgstr "Pruebe '%s --help' para más información." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "valor --ignore-initial inválido `%s'" +msgid "invalid --ignore-initial value '%s'" +msgstr "valor --ignore-initial inválido '%s'" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "las opciones -l y -s son incompatibles" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "la escritura falló" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "salida estándar" @@ -615,7 +617,7 @@ msgstr "" "Los parámetros opcionales SALTO1 y SALTO2 especifican el número de\n" "bytes que se saltan en cada fichero (cero por omisión)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -635,10 +637,10 @@ msgstr "" "GB 1.000.000.000, G 1.073.741.824, y así en adelante para T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Si un FICHERO es `-' o no se especifica, lee la entrada estándar." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Si un FICHERO es '-' o no se especifica, lee la entrada estándar." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "El estado de salida es 0 si las entradas son iguales, 1 si son diferentes,\n" @@ -646,18 +648,18 @@ msgstr "" #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "valor --bytes inválido `%s'" +msgid "invalid --bytes value '%s'" +msgstr "valor --bytes inválido '%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "falta un operando después de `%s'" +msgid "missing operand after '%s'" +msgstr "falta un operando después de '%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "operando extra `%s'" +msgid "extra operand '%s'" +msgstr "operando extra '%s'" #: src/cmp.c:491 #, c-format @@ -675,36 +677,36 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: fin de fichero encontrado en %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "longitud de contexto inválida `%s'" +msgid "invalid context length '%s'" +msgstr "longitud de contexto inválida '%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "este sistema no admite paginación" @@ -718,78 +720,78 @@ msgstr "este sistema no admite paginación" # se refiere. la opción de etiqueta de fichero se ha especificado demasiadas # veces. O más cortito, dejarlo como está :) em+ # Me parece que así está bien ... -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "demasiadas opciones de etiqueta de fichero" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "ancho inválido `%s'" +msgid "invalid width '%s'" +msgstr "ancho inválido '%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "opciones de ancho conflictivas" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "longitud del horizonte inválida `%s'" +msgid "invalid horizon length '%s'" +msgstr "longitud del horizonte inválida '%s'" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "tamaño de tab inválido `%s'" +msgid "invalid tabsize '%s'" +msgstr "tamaño de tab inválido '%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "opciones de tamaño de tab conflictivas" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "se ha especificado tanto --from-file como --to-file" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr " --normal produce un diff normal (predeterminado)" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "" "-q --brief indica sólo si los ficheros son diferentes o no" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files notifica cuándo dos ficheros son idénticos" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NÚM, --context[=NÚM] muestra NÚM (por omisión 3) líneas de contexto" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NÚM, --unified[=NÚM] muestra NÚM (por omisión 3) línea de contexto\n" " unificado" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "-e --ed produce un script ed" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs produce un diff en formato RCS" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side muestra en dos columnas" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" @@ -797,28 +799,28 @@ msgstr "" "impresión\n" " (por omisión 130)" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column muestra sólo en la columna izquierda las líneas " "comunes" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines no muestra las líneas comunes" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function muestra en qué función C está cada cambio" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=ER muestra la línea más reciente que encaje con ER" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" @@ -828,18 +830,18 @@ msgstr "" " (se puede repetir)" # Aquí a lo mejor también: la salida -> el resultado. sv -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs expande los tabuladores a espacios en la salida" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab hace que los tabuladores se alineen\n" " anteponiendo uno" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" @@ -847,7 +849,7 @@ msgstr "" "columnas\n" " de impresión (por omisión, 8)" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" @@ -865,49 +867,53 @@ msgstr "" # Te mandaré el gettext, para que veas lo que vale un peine... sv # X'D ... no soy tan malo ... ipg # Medita de nuevo si no usas resultado em -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-l, --paginate pasa la salida a través de `pr' para paginarla" +"-l, --paginate pasa la salida a través de 'pr' para paginarla" -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive compara recursivamente todos los " "subdirectorios" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference no sigue los enlaces simbólicos" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file trata los ficheros que no existan como vacíos" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file trata los ficheros originales que no " "existan\n" " como vacíos" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case descarta las diferencias entre mayúsculas y\n" " minúsculas al comparar los nombres de los " "ficheros" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case considera distintas mayúsculas y minúsculas\n" " cuando compara los nombres de los ficheros" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PAT excluye los ficheros que coincidan con PAT" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" @@ -915,14 +921,14 @@ msgstr "" "alguna\n" " expresión regular de FICHERO" -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FICHERO comienza por FICHERO cuando se comparan\n" " directorios" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -930,7 +936,7 @@ msgstr "" " --from-file=FICHERO1 compara FICHERO1 con todos los operandos;\n" " FICHERO1 puede ser un directorio" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -938,7 +944,7 @@ msgstr "" " --to-file=FICHERO2 compara todos los operandos con FICHERO2\n" " FICHERO2 puede ser un directorio" -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" @@ -946,60 +952,60 @@ msgstr "" "minúsculas\n" " en el contenido de los ficheros" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion descarta cambios debidos a expansiones de " "tabs" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space descarta todo el espacio en blanco" +msgstr "" +"-Z, --ignore-trailing-space descarta espacio en blanco al final de línea" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change descarta las diferencias en la cantidad de\n" " espacio en blanco" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space descarta los espacios en blanco" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B, --ignore-blank-lines descarta los cambios cuyas líneas son todas " +"-B, --ignore-blank-lines descarta los cambios en líneas completamente " "vacías" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=EXPR-REG descarta las líneas que coincidan con " "EXPR-REG" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "" "-a, --text trata todos los ficheros como de tipo texto" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr elimina los retornos de carro finales en la " "entrada" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr "" " --binary lee y escribe los datos en modo binario" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOMBRE genera un fichero combinado que muestra las\n" " diferencias con '#ifdef NOMBRE'" @@ -1007,23 +1013,23 @@ msgstr "" # Propongo similar -> parecida. Ver gettext. sv # Hmmm ... prefiero similar. Antes estaba puesto `parecida' y la verdad, # no quedaba tan bien. ipg -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT formatea los grupos de entrada GTYPE con GFMT" -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT formatea todas las líneas de entrada con LFMT" # ídem. sv -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT formatea las líneas de entrada LTYPE con LFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1032,13 +1038,13 @@ msgstr "" "resultado\n" " de diff, generalizando -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYPE es `old' (antiguo), `new' (nuevo) o `unchanged' (sin cambios).\n" -" GTYPE es como LTYPE o `changed' (cambiado)." +" LTYPE es 'old' (antiguo), 'new' (nuevo) o 'unchanged' (sin cambios).\n" +" GTYPE es como LTYPE o 'changed' (cambiado)." -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1067,7 +1073,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) si A es igual a B entonces T en caso contrario E" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1081,7 +1087,7 @@ msgstr "" "el\n" " número de línea de entrada" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1095,17 +1101,17 @@ msgstr "" " %c'\\OOO' el carácter con código octal OOO\n" " C el carácter C (los otros caracteres se representan a sí mismos)" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal se esfuerza en encontrar un grupo de cambios menor" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=NÚM mantiene NÚM líneas de prefijos y sufijos comunes" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" @@ -1113,75 +1119,80 @@ msgstr "" "son\n" " numerosos, pequeños y dispersos" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr " --help muestra esta ayuda y finaliza" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "-v, --version informa de la versión y finaliza" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"FICHEROS puede ser `FICHERO1 FICHERO2' o `DIRECTORIO1 DIRECTORIO2'\n" -" o `DIRECTORIO FICHERO...' o `FICHERO... DIRECTORIO'." +"FICHEROS puede ser 'FICHERO1 FICHERO2' o 'DIRECTORIO1 DIRECTORIO2'\n" +" o 'DIRECTORIO FICHERO...' o 'FICHERO... DIRECTORIO'." -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Si se da --from-file o --to-file, no hay restricciones en FICHERO(s)." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Si un FICHERO es `-', lee la entrada estándar." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Si un FICHERO es '-', lee la entrada estándar." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHEROS\n" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Compara FICHEROS línea por línea." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "la opción %s tiene el valor conflictivo `%s'" +msgid "conflicting %s option value '%s'" +msgstr "la opción %s tiene el valor conflictivo '%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "las especificaciones del estilo de salida son conflictivas" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Sólo en %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "no se puede comparar `-' con un directorio" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "no se puede comparar '-' con un directorio" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "la opción -D no se puede usar con directorios" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectorios comunes: %s y %s\n" # Nota: El segundo y el cuarto `%s' son tipos de fichero. # Por ejemplo, "texto C", "texto FORTRAN", etc. -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "El fichero %s es un %s mientras que el %s es un %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Los enlaces simbólicos %s y %s son distintos\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Los ficheros %s y %s son idénticos\n" @@ -1197,11 +1208,11 @@ msgid "incompatible options" msgstr "opciones incompatibles" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "se ha especificado `-' para más de un fichero de entrada" +msgid "'-' specified for more than one input file" +msgstr "se ha especificado '-' para más de un fichero de entrada" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "la lectura falló" @@ -1258,9 +1269,9 @@ msgstr "" "-X como -x, pero encierra conflictos entre corchetes" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -"-i añade las órdenes `w' y `q' a los `scripts' ed" +"-i añade las órdenes 'w' y 'q' a los scripts ed" #: src/diff3.c:438 msgid "" @@ -1370,32 +1381,32 @@ msgstr "error interno: tipo de diff inválido en process_diff" msgid "invalid diff format; invalid change separator" msgstr "formato de diff inválido; separador de cambio inválido" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "formato de diff inválido; línea final incompleta" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "no se ha podido invocar al programa subsidiario `%s'" +msgid "subsidiary program '%s' could not be invoked" +msgstr "no se ha podido invocar al programa subsidiario '%s'" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "" "formato de diff inválido; caracteres incorrectos al comienzo de la línea" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "error interno: tipo de diff inválido pasado a la salida" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "el fichero de entrada ha menguado" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "no se pueden comparar los nombres de fichero `%s' y `%s'" +msgid "cannot compare file names '%s' and '%s'" +msgstr "no se pueden comparar los nombres de fichero '%s' y '%s'" #: src/dir.c:209 #, c-format @@ -1407,7 +1418,7 @@ msgstr "%s: bucle de directorio recursivo" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" @@ -1415,22 +1426,22 @@ msgstr "" "resultado\n" " al fichero FICHERO" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i, --ignore-case considera iguales mayúsculas y minúsculas" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion descarta cambios debidos a expansiones de tabs" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space descarta todo el espacio en blanco" +msgstr "" +"-Z, --ignore-trailing-space descarta espacio en blanco al final de línea" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" @@ -1438,52 +1449,58 @@ msgstr "" "espacio\n" " en blanco" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W, --ignore-all-space descarta todo el espacio en blanco" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B, --ignore-blank-lines descarta los cambios cuyas líneas son todas " "vacías" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=EXPR-REG descarta las líneas que coincidan con " +"EXPR-REG" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr elimina los retornos de carro finales en la " "entrada" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "" "-a, --text trata todos los ficheros como de tipo texto" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=NÚM muestra como mucho NÚM columnas de impresión\n" " (por omisión 130)" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l, --left-column muestra sólo la columna izquierda de líneas " "comunes" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s, --suppress-common-lines no muestra las líneas comunes" # Aquí a lo mejor también: la salida -> el resultado. sv -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs expande los tabuladores a espacios en la salida" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" @@ -1491,13 +1508,13 @@ msgstr "" "NÚM\n" " columnas de impresión (por omisión, 8)" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal se esfuerza en encontrar un grupo de cambios " "menor" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" @@ -1505,35 +1522,35 @@ msgstr "" "cambios\n" " son numerosos, pequeños y dispersos" -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAMA utiliza PROGRAMA para comparar los ficheros" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr " --help muestra esta ayuda y finaliza" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "-v, --version informa de la versión y finaliza" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO1 FICHERO2\n" # Se admiten sugerencias. -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "" "Combinación a dos columnas de las diferencias entre FICHERO1 y FICHERO2." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "no se puede mezclar interactivamente con la entrada estándar" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "los dos ficheros que hay que comparar son directorios" @@ -1578,7 +1595,7 @@ msgstr "los dos ficheros que hay que comparar son directorios" # ## verbosidad # ## I. De verbo. # ## 1. (sustantivo femenino). Verborrea. -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-04-19 14:36+03:00\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -23,7 +23,7 @@ msgstr "ohjelmavirhe" msgid "stack overflow" msgstr "pinon ylivuoto" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Tuntematon järjestelmävirhe" @@ -136,100 +136,102 @@ msgstr "%s: valitsin \"%s\" vaatii argumentin\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Onnistui" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Ei vastaavuutta" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Virheellinen säännöllinen lauseke" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Virheellinen vertailumerkki" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Virheellinen merkkiluokan nimi" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Kenoviiva lopussa" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Virheellinen takaisinviittaus" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Pariton [ tai [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Pariton ( tai \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Pariton \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Virheellinen \"\\{\\}\":n sisältö" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Virheellinen välin loppu" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Muisti lopussa" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Virheellinen edeltävä säännöllinen lauseke" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Ennenaikainen säännöllisen lausekkeen loppu" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Liian suuri säännöllinen lauseke" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Pariton ) tai \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Ei edellistä säännöllistä lauseketta" @@ -261,17 +263,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "virheellinen arvo \"%s\" valitsimelle --bytes" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "virheellinen horisontin pituus \"%s\"" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -440,7 +442,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Tiedostot %s ja %s eroavat\n" @@ -450,7 +452,7 @@ msgstr "Tiedostot %s ja %s eroavat\n" msgid "Binary files %s and %s differ\n" msgstr "Binääritiedostot %s ja %s eroavat\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Ei rivinvaihtoa tiedoston lopussa" @@ -464,14 +466,14 @@ msgstr "Torbjörn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Kokeile \"%s --help\" saadaksesi lisää tietoa." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "virheellinen arvo \"%s\" valitsimelle --ignore-initial" #: src/cmp.c:147 @@ -479,14 +481,14 @@ msgstr "virheellinen arvo \"%s\" valitsimelle --ignore-initial" msgid "options -l and -s are incompatible" msgstr "valitsimet -l ja -s eivät ole yhteensopivia" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "kirjoitus epäonnistui" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "vakiotuloste" @@ -551,7 +553,7 @@ msgid "" msgstr "" "OHITA1 ja OHITA2 ovat jokaisessa tiedostossa ohitettavien tavujen määrä." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -567,28 +569,29 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, sekä T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Jos TIEDOSTO on \"-\" tai puuttuu, luetaan vakiosyötteestä." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Paluuarvo on 0, jos syötteet ovat samoja, 1 jos erilaisia, " "ongelmatilanteissa 2." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "virheellinen arvo \"%s\" valitsimelle --bytes" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "puuttuva operandi argumentin \"%s\" jälkeen" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "ylimääräinen operandi \"%s\"" #: src/cmp.c:491 @@ -607,212 +610,213 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: Tiedoston %s loppu\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "virheellinen kontekstin pituus \"%s\"" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "tämä isäntä ei tue sivunumerointia" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "liian monta tiedostonimivalitsinta" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "virheellinen leveys \"%s\"" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "ristiriitaiset leveysvalinnat" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "virheellinen horisontin pituus \"%s\"" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "virheellinen sarkaimen koko \"%s\"" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "ristiriitaiset sarkaimen kokovalinnat" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "sekä valitsin --from-file että --to-file on määritetty" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Tulosta normaali diff." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Kertoo vain, eroavatko tiedostot." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Ilmoita, jos kaksi tiedostoa ovat samat." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Käsittelee kaikki tiedostot tekstinä." +msgstr "-e --ed Tulosta ed-skripti." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Tulosta RCS-muotoinen diff." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Näyttää versiotiedot." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Tulosta vain yhteisten rivien vasen palsta" -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Älä tulosta yhteisiä rivejä." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Laajentaa sarkaimet välilyönneiksi tulosteessa." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Lisää sarkain rivien alkuun." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=KOKO Sarkaimen koko on KOKO (oletus 8) merkkiä." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate Ohjaa tuloste ohjelman \"pr\" läpi sivunumerointia varten." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Vertaa löytyneitä alihakemistoja rekursiivisesti." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Käsittele puuttuvia tiedostoja tyhjinä." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Käsittele puuttuvia tiedostoja tyhjinä." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Älä huomioi kirjainkokoa tiedostojen nimiä " "verrattaessa." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Kirjainkoko huomioidaan tiedostonimiä " "verrattaessa." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x HAHMO --exclude=HAHMO Jätä pois tiedostot, jotka vastaavat HAHMOa." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -820,7 +824,7 @@ msgstr "" "-X TIEDOSTO --exclude-from=TIEDOSTO Jätä pois TIEDOSTOssa listatut " "tiedostot." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -828,7 +832,7 @@ msgstr "" "-S TIEDOSTO --starting-file=TIEDOSTO Aloita TIEDOSTOlla verrattaessa " "hakemistoja." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -837,7 +841,7 @@ msgstr "" "--from-file=TIEDOSTO1 Vertaa TIEDOSTO1:ä kaikkiin operandeihin. TIEDOSTO1 " "voi olla hakemisto." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -846,7 +850,7 @@ msgstr "" "--to-file=TIEDOSTO2 Vertaa kaikkia operandeja TIEDOSTO2:een. TIEDOSTO2 voi " "olla hakemisto." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" @@ -854,98 +858,99 @@ msgstr "" "-i --ignore-case Älä huomioi kirjainkokoa tiedostojen sisältöä " "verrattaessa." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Älä huomioi sarkainten laajennuksesta johtuvia " "eroja." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-white-space Älä huomioi tyhjiä merkkejä." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Älä huomioi tyhjistä merkeistä johtuvia eroja." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-white-space Älä huomioi tyhjiä merkkejä." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines Älä huomioi tyhjistä riveistä johtuvia eroja." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I SI --ignore-matching-lines=SI Älä huomioi eroavia rivejä, jotka " "vastaavat säännöllistä lauseketta." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Käsittelee kaikki tiedostot tekstinä." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Poista lopussa oleva vaununpalautus syötteestä." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Lukee ja kirjoittaa dataa binääritilassa." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NIMI --ifdef=NIMI Tulosta yhdistetty tiedosto näyttämään \"#ifdef NIMI" "\"-erot." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYYPPI-group-format=GMUOTO Sama, muotoile GTYYPPIset syöteryhmät " "GMUOTOon." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LMUOTO Sama, muotoile kaikki syöterivit LMUOTOon." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYYPPI-line-format=MUOTO Sama, muotoile LTYYPPIset syöterivit LMUOTOon." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYYPPI on \"old\", \"new\" tai \"unchanged\". GTYYPPI on LTYYPPI tai " "\"changed\"." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -974,7 +979,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -987,7 +992,7 @@ msgstr "" " %l rivin sisältö, mahdollinen edeltävä rivinvaihto poislukien\n" " %[-][LEVEYS][.[TARKK]]{doxX}n syöterivin numero printf-tyylillä" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1001,19 +1006,19 @@ msgstr "" " %c'C' yksittäinen merkki C\n" " %c'\\OOO' yksittäinen merkki oktaalikoodilla OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Yrittää löytää pienemmän määrän muutoksia." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=MÄÄRÄ Säilytä MÄÄRÄ riviä yhteisestä etu- ja " "jälkiliitteestä." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1021,23 +1026,24 @@ msgstr "" "-H --speed-large-files Oleta suuret tiedostot, joissa pieniä muutoksia " "ympäri tiedoston." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Näyttää versiotiedot." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "TIEDOSTOT ovat \"TIEDOSTO1 TIEDOSTO2\" tai \"HAK1 HAK2\" tai \"HAK " "TIEDOSTO...\" tai \"TIEDOSTO... HAK\"." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." @@ -1045,54 +1051,61 @@ msgstr "" "Jos valitsin --from-file tai --to-file on annettu, TIEDOSTOILLE ei ole " "rajoituksia." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Jos TIEDOSTO on \"-\", luetaan vakiosyötteestä." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Käyttö: %s [VALITSIN]... TIEDOSTOT\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Vertaa tiedostoja rivi riviltä." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "ristiriitainen arvo \"%2$s\" valitsimelle %1$s" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "ristiriitaiset tulostustyylin valinnat" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Vain hakemistossa %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "ei voi verrata syötettä \"-\" hakemistoon" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "valitsin -D ei toimi hakemistojen kanssa" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Yhteiset alihakemistot: %s ja %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Tiedosto %s on %s, kun taas tiedosto %s on %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Tiedostot %s ja %s eroavat\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Tiedostot %s ja %s ovat identtiset\n" @@ -1108,11 +1121,12 @@ msgid "incompatible options" msgstr "yhteensopimattomat valitsimet" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "\"-\" on määritetty useammaksi kuin yhdeksi syötetiedostoksi" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lukeminen epäonnistui" @@ -1150,14 +1164,12 @@ msgid "" msgstr "-x --overlap-only Tulosta päällekkäiset muutokset." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Tulosta yhdistämättömät muutokset, ristiriidat merkiten." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Lisää komennot \"w\" ja \"q\" ed-skripteihin." #: src/diff3.c:438 @@ -1193,9 +1205,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Käsittelee kaikki tiedostot tekstinä." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1247,30 +1258,30 @@ msgstr "sisäinen virhe: virheellinen diff-tyyppi funktiossa process_diff" msgid "invalid diff format; invalid change separator" msgstr "virheellinen diff-muoto; virheellinen muutoserotin" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "virheellinen diff-muoto; viimeinen rivi vajaa" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "apuohjelmaa \"%s\" ei voitu käynnistää" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "virheellinen diff-muoto; väärät rivin alkumerkit" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "sisäinen virhe: virheellinen diff-muoto välitetty tulosteeseen" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "syötetiedosto kutistui" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "ei voi verrata tiedostonimiä \"%s\" ja \"%s\"" #: src/dir.c:209 @@ -1283,7 +1294,7 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" @@ -1291,87 +1302,94 @@ msgstr "" "-o TIEDOSTO --output=TIEDOSTO Vuorovaikutteinen toiminta, tuloste " "TIEDOSTOon." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Käsittele isot ja pienet kirjaimet samoina." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Älä huomioi sarkainten laajennuksesta johtuvia " "eroja." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-white-space Älä huomioi tyhjiä merkkejä." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Älä huomioi tyhjistä merkeistä johtuvia eroja." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-white-space Älä huomioi tyhjiä merkkejä." +msgstr "-W --ignore-all-white Älä huomioi tyhjiä merkkejä." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B --ignore-blank-lines Älä huomioi tyhjistä riveistä johtuvia eroja." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I SI --ignore-matching-lines=SI Älä huomioi eroavia rivejä, jotka " +"vastaavat säännöllistä lauseketta." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Poista lopussa oleva vaununpalautus syötteestä." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Käsittelee kaikki tiedostot tekstinä." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Tulosta vain yhteisten rivien vasen palsta" -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Älä tulosta yhteisiä rivejä." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Laajentaa sarkaimet välilyönneiksi tulosteessa." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=KOKO Sarkaimen koko on KOKO (oletus 8) merkkiä." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Yrittää löytää pienemmän määrän muutoksia." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1379,40 +1397,39 @@ msgstr "" "-H --speed-large-files Oleta suuret tiedostot, joissa pieniä muutoksia " "ympäri tiedoston." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=OHJELMA Käytä OHJELMAa tiedostojen vertaamiseen." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Käsittelee kaikki tiedostot tekstinä." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Näyttää versiotiedot." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Käyttö: %s [VALITSIN]...TIEDOSTO1 TIEDOSTO2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Tiedostojen erojen yhdistäminen vierekkäisillä palstoilla." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "vakiosyötettä ei voi yhdistää vuorovaikutteisesti" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "molemmat vertailtavat tiedostot ovat hakemistoja" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1437,60 +1454,47 @@ msgstr "" "v:\tSisällytä yhteiset rivit automaattisesti ja ilmoita niistä.\n" "q:\tLopeta.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: virheellinen valitsin -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Tämä on vapaa ohjelmisto; katsokaa kopiointiehdot lähdekoodista. Takuuta " +#~ "EI\n" +#~ "OLE; ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA tai SOPIVUUDESTA " +#~ "TIETTYYN\n" +#~ "TARKOITUKSEEN.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i OHITA1:OHITA2 --ignore-initial=OHITA1:OHITA2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent Ei tulostusta; vain paluuarvo." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Näyttää versiotiedot." - #~ msgid "--help Output this help." #~ msgstr "--help Näyttää tämän ohjeen." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Vertaa kolmea tiedostoa rivi riviltä." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Älä huomioi sarkainten laajennuksesta " -#~ "johtuvia eroja." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Älä huomioi tyhjistä merkeistä johtuvia eroja." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-white Älä huomioi tyhjiä merkkejä." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." #~ msgstr "" -#~ "-B --ignore-blank-lines Älä huomioi tyhjistä riveistä johtuvia eroja." +#~ "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <bug-gnu-utils@gnu." +#~ "org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Poista lopussa oleva vaununpalautus syötteestä." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "valitsin \"-%ld\" on vanhentunut, käytä \"-%c %ld\"" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Käsittelee kaikki tiedostot tekstinä." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "valitsin \"-%ld\" on vanhentunut; jätä se pois" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1504,10 +1508,6 @@ msgstr "" #~ " -F SI --show-function-line=SI Näytä viimeisin säännöllistä lauseketta " #~ "vastaava rivi." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Tulosta ed-skripti." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1520,32 +1520,12 @@ msgstr "" #~ " --left-column Tulosta vain yhteisten rivien vasen palsta.\n" #~ " --suppress-common-lines Älä tulosta yhteisiä rivejä." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Laajentaa sarkaimet välilyönneiksi tulosteessa." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Lisää sarkain rivien alkuun." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=KOKO Sarkaimen koko on KOKO (oletus 8) merkkiä." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Yrittää löytää pienemmän määrän muutoksia." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Olettaa tiedostojen olevan suuria ja muutosten " #~ "pieniä sekä hajanaisia." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Tulosta kaikki muutokset, ristiriidat merkiten." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Tulosta päällekkäiset muutokset sulkeiden sisään." @@ -1556,82 +1536,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L NIMIÖ --label=NIMIÖ Käytä NIMIÖtä tiedostonimen sijaan." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=OHJELMA Käytä OHJELMAa tiedostojen vertaamiseen." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-white Älä huomioi tyhjiä merkkejä." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä " -#~ "riville." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Tulosta vain yhteisten rivien vasen palsta" - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Olettaa tiedostojen olevan suuria ja muutosten " -#~ "pieniä sekä hajanaisia." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "lukeminen epäonnistui" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "kirjoitus epäonnistui" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "lukeminen epäonnistui" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "lukeminen epäonnistui" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "kirjoitus epäonnistui" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "kirjoitus epäonnistui" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: virheellinen valitsin -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Tämä on vapaa ohjelmisto; katsokaa kopiointiehdot lähdekoodista. Takuuta " -#~ "EI\n" -#~ "OLE; ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA tai SOPIVUUDESTA " -#~ "TIETTYYN\n" -#~ "TARKOITUKSEEN.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "" -#~ "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <bug-gnu-utils@gnu." -#~ "org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "valitsin \"-%ld\" on vanhentunut, käytä \"-%c %ld\"" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "valitsin \"-%ld\" on vanhentunut; jätä se pois" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "apuohjelmaa \"%s\" ei löytynyt" @@ -1,15 +1,15 @@ # Messages français pour GNU concernant diffutils. -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # # Michel Robitaille <robitail@IRO.UMontreal.CA>, 1996. -# Frédéric Marchal <fmarchal@perso.be>, 2011. +# Frédéric Marchal <fmarchal@perso.be>, 2012. msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.1\n" +"Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-08-18 17:41+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-10-31 08:16+0100\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.0\n" #: lib/c-stack.c:204 lib/c-stack.c:297 msgid "program error" @@ -27,7 +27,7 @@ msgstr "erreur du programme" msgid "stack overflow" msgstr "débordement de pile" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -53,7 +53,7 @@ msgstr "fichier spécial-caractères" #: lib/file-type.c:50 msgid "fifo" -msgstr "«fifo»" +msgstr "« fifo »" #: lib/file-type.c:53 msgid "symbolic link" @@ -61,7 +61,7 @@ msgstr "lien symbolique" #: lib/file-type.c:56 msgid "socket" -msgstr "«socket»" +msgstr "« socket »" #: lib/file-type.c:59 msgid "message queue" @@ -140,100 +140,102 @@ msgstr "%s: l'option « -W %s » requiert un argument\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "« " -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr " »" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Succès" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Pas de concordance" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "L'expression régulière est invalide" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Le caractère de regroupement est invalide" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Le nom d'un ensemble de caractères est invalide" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barre oblique inverse à la fin" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "La référence arrière est invalide" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ or [^ sans vis-à-vis" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr " ( ou \\( sans vis-à-vis" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ sans vis-à-vis" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Le contenu de \\{\\} est invalide" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "La fin d'intervalle est invalide" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Mémoire épuisée" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "L'expression régulière précédente est invalide" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fin prématurée de l'expression régulière" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Expression régulière trop grande" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") or \\) sans vis-à-vis" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "N'est pas précédé d'une expression régulière" @@ -264,17 +266,17 @@ msgstr "impossible de ré-ouvrir %s avec le mode %s" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" -msgstr "argument pour %s%s pas valable: «%s»" +msgid "invalid %s%s argument '%s'" +msgstr "argument pour %s%s pas valable: « %s »" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" +msgid "invalid suffix in %s%s argument '%s'" msgstr "suffixe par valable dans l'argument de %s%s: « %s »" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "%s%s: argument « %s » trop grand" #: lib/version-etc.c:74 @@ -455,7 +457,7 @@ msgstr "" "Aide générale sur l'utilisation des logiciels GNU: <http://www.gnu.org/" "gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Les fichiers %s et %s sont différents\n" @@ -465,7 +467,7 @@ msgstr "Les fichiers %s et %s sont différents\n" msgid "Binary files %s and %s differ\n" msgstr "Les fichiers binaires %s et %s sont différents\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Pas de fin de ligne à la fin du fichier" @@ -479,29 +481,29 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Pour en savoir davantage, utilisez: « %s --help »." +msgid "Try '%s --help' for more information." +msgstr "Utilisez « %s --help » pour en savoir d'avantage." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "valeur invalide pour --ignore-initial : « %s »" +msgid "invalid --ignore-initial value '%s'" +msgstr "valeur invalide pour --ignore-initial: « %s »" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "options -l et -s sont incompatibles" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "échec d'écriture" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "sortie standard" @@ -565,7 +567,7 @@ msgstr "" "escamoter\n" "au début de chaque fichier (zéro par défaut)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -584,10 +586,10 @@ msgstr "" "GB 1.000.000.000, G 1.073.741.824, et ainsi de suite pour T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Si FICHIER spécifié est «-» ou manquant, lire sur l'entrée standard." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Si un FICHIER est « - » ou manquant, lire sur l'entrée standard." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Le statut de fin d'exécution est 0 si les entrées sont les mêmes, 1 si " @@ -595,18 +597,18 @@ msgstr "" #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "valeur invalide pour --bytes: «%s»" +msgid "invalid --bytes value '%s'" +msgstr "valeur invalide pour --bytes: « %s »" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "opérande manquante après «%s»" +msgid "missing operand after '%s'" +msgstr "opérande manquante après « %s »" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "opérande supplémentaire «%s»" +msgid "extra operand '%s'" +msgstr "opérande supplémentaire « %s »" #: src/cmp.c:491 #, c-format @@ -624,146 +626,146 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: Fin-de-fichier (EOF) sur %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "longueur du contexte invalide «%s»" +msgid "invalid context length '%s'" +msgstr "longueur du contexte invalide « %s »" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "La pagination n'est pas supporté sur cette machine" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "Trop de noms de fichiers dans les options" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "largeur invalide «%s»" +msgid "invalid width '%s'" +msgstr "largeur invalide « %s »" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "options de largeur conflictuelles" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "longueur d'horizon invalide «%s»" +msgid "invalid horizon length '%s'" +msgstr "longueur d'horizon invalide « %s »" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "taille de tabulation invalide «%s»" +msgid "invalid tabsize '%s'" +msgstr "taille de tabulation invalide « %s »" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "options conflictuelles de taille de tabulation" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file et --to-file ont été spécifiés ensemble" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr "" " --normal Produire un « diff » en format normal (par " "défaut)" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "" "-q, --brief Indiquer seulement si les fichiers diffèrent" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files Indiquer si les deux fichiers sont identiques" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C N, --context[=N] Afficher N (3 par défaut) lignes du " "contexte copié" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U N, --unified[=N] Afficher N (3 par défaut) lignes dans " "le context unifié" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "-e, --ed Générer un script pour « ed »" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "" "-n, --rcs Générer un fichier « diff » au format RCS" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side Affichage sur deux colonnes" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=N Limiter la sortie à au plus N colonnes " "imprimées (130 par défaut)" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column Afficher les lignes identiques uniquement dans " "la colonne de gauche" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines Ne pas afficher les lignes identiques" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function Afficher dans quelle fonction C le changement " "se trouve" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE Montrer la ligne la plus récente correspondant " "à RE" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" @@ -771,89 +773,93 @@ msgstr "" " --label ÉTIQUETTE Utiliser ÉTIQUETTE au lieu du nom de fichier\n" " (peut être répété)" -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs Étaler les tabulateurs en espaces dans la " "sortie" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab Aligner les tabulateurs en préfixant un " "tabulateur" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=N Les balises de tabulation sont à chaque N (8 " "par défaut) colonnes" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty Supprimer les espaces et les tabulations avant " "les lignes vides" -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate Relayer la sortie à « pr » afin de la paginer" -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive Comparer récursivement les sous-répertoires " "trouvés" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference Ne pas suivre les liens symboliques" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file Traiter les fichiers absents comme des " "fichiers vides" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file Traiter les premiers fichiers absents comme " "vides" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case Ignorer la casse lors de la comparaison des " "noms de fichiers" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case Tenir compte de la casse lors de la " "comparaison des noms de fichiers" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PAT Exclure les fichiers dont les noms concordent " "avec le PATron" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FICHIER Exclure les fichiers dont les noms\n" " concordent avec ceux contenus dans le FICHIER" -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FICHIER Débuter la comparaison des répertoires par le " "FICHIER" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -861,7 +867,7 @@ msgstr "" " --from-file=FICHIER1 Comparer le FICHIER1 à toutes les opérandes.\n" " FICHIER1 peut être un répertoire" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -869,85 +875,86 @@ msgstr "" " --to-file=FICHIER2 Comparer toutes les opérandes à FICHIER2.\n" " FICHIER2 peut être un répertoire" -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case Ignorer les différences de casses dans le " "contenu des fichiers" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion Ignorer les changements liés à l'expansion des " "tabulations" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space Ignorer tout blanc d'espacement" +msgstr "" +"-Z, --ignore-trailing-space Ignorer les blancs d'espacement à la fin " +"de la ligne" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change Ignorer les changements dans le nombre " "d'espaces" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space Ignorer tout blanc d'espacement" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines Ignorer les changements dont toutes les lignes " "sont blanches" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE Ignorer les différences dont toutes les\n" " lignes concordent avec l'expression régulière RE" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "" "-a, --text Traiter tous les fichiers comme des textes" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Éliminer les retours de chariot de l'entrée" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr " --binary Lire et écrire les données en binaire" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOM Afficher les fichiers fusionnés en marquant les " "différences par des « #ifdef NOM »" -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT Formater les groupes d'entrée GTYPE avec GFMT" -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT Formater toutes les lignes d'entrée avec LFMT" -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT Formater les lignes d'entrée LTYPE avec LFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -955,13 +962,13 @@ msgstr "" " Ces options de formatage fournissent un contrôle fin sur la sortie\n" " de diff et généralise -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE peut être soit « old », « new », ou « unchanged ». GTYPE prend une " "des valeurs de LTYPE ou « changed »." -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -991,7 +998,7 @@ msgstr "" " E F-1\n" " M L+1 %(A=B?T:E) si A égal B alors T sinon E" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1004,7 +1011,7 @@ msgstr "" " %[-][LARGEUR][.[PREC]]{doxX}n la spécification du numéro de ligne\n" " d'entrée selon le format de printf" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1018,96 +1025,101 @@ msgstr "" " %c'\\OOO» le caractère dont le code octal est OOO C le " "caractère C (les autres caractères se représentent eux-mêmes)" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal Rechercher assidûment le plus petit ensemble de " "différences" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=N Retenir N lignes ayant des préfixes et suffixes " "identiques" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files Suppose de grands fichiers et de nombreux " "petits changements éparpillés" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr " --help Afficher cette aide et terminer" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "" "-v, --version Afficher le nom et la version du logiciel et " "terminer" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FICHIERS sont « FICHIER1 FICHIER2 » ou « RÉP1 RÉP2 » ou « RÉP FICHIER... » " "ou « FICHIER... RÉP »." -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Si --from-file ou --to-file sont fournis, il n'y a pas de restriction sur " "les FICHIERS." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Si le FICHIER spécifié est « - » alors lire depuis l'entrée standard." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Si un FICHIER est « - » alors lire depuis l'entrée standard." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Usage: %s [OPTION]... FICHIERS\n" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Comparer les fichiers ligne par ligne." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" +msgid "conflicting %s option value '%s'" msgstr "valeur conflictuelle de l'option %s: « %s »" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "options de style de sortie conflictuelles" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Seulement dans %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "Ne peut comparer « - » avec un répertoire" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "ne peut comparer « - » avec un répertoire" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "L'option -D ne traite pas les répertoires" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Les sous-répertoires %s et %s sont identiques\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Le fichier %s est un %s alors que le fichier %s est un %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Les liens symboliques %s et %s sont différents\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Les fichiers %s et %s sont identiques\n" @@ -1123,11 +1135,11 @@ msgid "incompatible options" msgstr "options incompatibles" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +msgid "'-' specified for more than one input file" msgstr "« - » fourni pour plus d'un fichier d'entrée" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lecture non-réussie" @@ -1172,7 +1184,7 @@ msgstr "" "-X Comme -x mais le conflits sont entre crochets" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i Ajouter les commandes « w » et « q » au script " "« ed »" @@ -1285,31 +1297,31 @@ msgstr "erreur interne: type de « diff » invalide dans process_diff" msgid "invalid diff format; invalid change separator" msgstr "format de « diff » invalide ; séparateur de changement invalide" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "format de « diff » invalide ; dernière ligne incomplète" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr "programme subsidiaire « %s » n'a pu être invoqué" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "" "format de « diff » invalide ; caractères incorrects au début de la ligne" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "erreur interne : type de « diff » invalide fourni en sortie" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "le fichier d'entrée a rétréci" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" +msgid "cannot compare file names '%s' and '%s'" msgstr "ne peut comparer les noms de fichier « %s » et « %s »" #: src/dir.c:209 @@ -1322,129 +1334,136 @@ msgstr "%s: boucle récursive dans le répertoire" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o, --output=FICHIER Agir interactivement, avec sortie sur FICHIER" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i, --ignore-case Banaliser majuscules et minuscules" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion Ignorer les changements liés à l'expansion des " "tabulations" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space Ignorer tout blanc d'espacement" +msgstr "" +"-Z, --ignore-trailing-space Ignorer les blancs d'espacement à la fin " +"de la ligne" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change Ignorer les changements dans l'espacement" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W, --ignore-all-space Ignorer tout blanc d'espacement" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B, --ignore-blank-lines Ignorer les changements dont toutes les lignes " "sont blanches" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE Ignorer les différences dont toutes les\n" +" lignes concordent avec l'expression régulière RE" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Éliminer les retours de chariot de l'entrée" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "" "-a, --text Traiter tous les fichiers comme des textes" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=N Limiter la sortie à au plus N colonnes " "imprimées (130 par défaut)" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l, --left-column Afficher uniquement la colonne de gauche des " "lignes identiques" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s, --suppress-common-lines Ne pas afficher les lignes identiques" -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs Étaler les tabulateurs en espaces dans la sortie" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" " --tabsize=N Les balises de tabulation sont à chaque N (8 " "par défaut) colonnes" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal Rechercher assidûment le plus petit ensemble de " "différences" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" "-H, --speed-large-files Suppose de grands fichiers et de nombreux " "petits changements éparpillés" -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROG Utiliser le PROGramme pour comparer les fichiers" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr " --help Afficher cette aide et terminer" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "" "-v, --version Afficher le nom et la version du logiciel et " "terminer" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Usage: %s [OPTION]... FICHIER1 FICHIER2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Fusion côte à côte des différences des fichiers." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "ne peut fusionner l'entrée standard interactivement" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "les deux fichiers à comparer sont des répertoires" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-12-03 13:47-0500\n" "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n" "Language-Team: Irish <ga@li.org>\n" @@ -24,7 +24,7 @@ msgstr "earrid chlir" msgid "stack overflow" msgstr "cruach thar maoil" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Earrid chrais anaithnid" @@ -139,104 +139,106 @@ msgstr "%s: n folir argint don rogha `%s'\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Bua!" # #-#-#-#-# findutils-4.2.6.ga.po (findutils 4.2.6) #-#-#-#-# # ugh. Not clear what kind of things we're matching -- KPS -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nl a leithid ann" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Slonn ionadaochta neamhbhail" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carachtar cimheasa neamhbhail" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Aicme charachtair neamhbhail" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Clslais ag deireadh" # #-#-#-#-# sed-4.1.1.ga.po (sed 4.1.1) #-#-#-#-# # coinage - KPS -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Cltagairt neamhbhail" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ n [^ corr" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( n \\( corr" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ corr" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "bhar neamhbhail idir \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Deireadh raoin neamhbhail" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Cuimhne dithe" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Is neamhbhail an slonn ionadaochta roimhe seo" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Deireadh le slonn ionadaochta gan choinne" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Slonn ionadaochta rmhr" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") n \\) corr" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nl aon slonn ionadaochta roimhe seo" @@ -268,17 +270,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "luach neamhbhail --bytes `%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "fad laslne neamhbhail `%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -446,7 +448,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "T difrocht idir na comhaid %s agus %s\n" @@ -456,7 +458,7 @@ msgstr "T difrocht idir na comhaid %s agus %s\n" msgid "Binary files %s and %s differ\n" msgstr "T difrocht idir na comhaid %s agus %s\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Gan lne nua ag an chomhadchroch" @@ -470,14 +472,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fhil." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "luach neamhbhail --ignore-initial `%s'" #: src/cmp.c:147 @@ -485,14 +487,14 @@ msgstr "luach neamhbhail --ignore-initial `%s'" msgid "options -l and -s are incompatible" msgstr "Nl na roghanna -l agus -s comhoirinach" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "teipeadh ag scrobh" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "aschur caighdenach" @@ -557,7 +559,7 @@ msgid "" msgstr "" "Is ard at i SCIP1 agus SCIP2 n lonta na mbeart a scipeil i ngach comhad." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -573,26 +575,27 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, srl. do T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Mura bhfuil COMHAD ann, n ms `-' , ligh n ionchur caighdenach." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Stdas scortha: 0 ms ionann iad, 1 ms difriil, 2 m t fadhb ann." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "luach neamhbhail --bytes `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "n folir argint i ndiaidh `%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "oibreann breise `%s'" #: src/cmp.c:491 @@ -611,212 +614,213 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF ar %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "Fad neamhbhail comhthacs `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "N thacatear leis an uimhri leathanach ar an stromhaire seo" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "an iomarca argint do lipid chomhaid" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "leithead neamhbhail `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "roghanna leithid contrrtha" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "fad laslne neamhbhail `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "t an mhid thib `%s' neamhbhail" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "Roghanna tbmhid contrrtha" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "tugadh --from-file agus --to-file lena chile" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Aschuir diff coitianta." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief N taispein ach difriil n nach ea." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Tuairiscigh nuair at dh chomhad comhionanna." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w UIMH --width=UIMH UIMH coln priontla ar a mhad (ramhshocr=130)." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w UIMH --width=UIMH UIMH coln priontla ar a mhad (ramhshocr=130)." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Caith le gach comhad mar thacschomhad." +msgstr "-e --ed Aschuir script `ed'." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Aschuir diff i gcruth RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Taispein eolas faoin leagan." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w UIMH --width=UIMH UIMH coln priontla ar a mhad (ramhshocr=130)." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column N taispein an coln ar dheis ms ionann iad." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines N taispein lnte at i bpirt acu." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs leathnaigh tib go spsanna san aschur." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Ailnigh tib tr thb a chur in ionad sps tosaigh." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=UIMH Tbstop gach UIMH coln (ramhshocr=8)." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate uimhrigh leathanaigh le `pr'." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Cuir fochomhadlanna i gcomparid go hathchrsach." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Caith le comhad ar iarraidh mar chomhad folamh." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Ms ar iarraidh, caith leis an chad chomhad\n" " mar chomhad folamh." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case N b csogair le hainmneacha comhaid." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case B csogair maidir le hainmneacha comhaid." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-X SLONN --exclude=SLONN Fg comhaid as m t siad comhoirinacha le SLONN." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -825,7 +829,7 @@ msgstr "" "haon\n" " slonn ionadaochta as an CHOMHAD." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -833,7 +837,7 @@ msgstr "" "-S COMHAD --starting-file=COMHAD Tosaigh le COMHAD agus comhadlanna " "gcimheas." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -841,7 +845,7 @@ msgid "" msgstr "" "--from-file=COMHAD Cuir COMHAD (n comhadlann) i gcomparid le gach oibreann." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -849,100 +853,101 @@ msgid "" msgstr "" "--to-file=COMHAD Cuir gach oibreann i gcomparid le COMHAD (n comhadlann)." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case N b csogair le hinneachar na gcomhad." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Dan neamhshuim ar athruithe leathn na dtib." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Dan neamhshuim ar sps bn go hiomln." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Dan neamhshuim ar mhid an spis bn." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Dan neamhshuim ar sps bn go hiomln." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Dan neamhshuim ar lnte folmha." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I SI --ignore-matching-lines=RE Dan neamhshuim ar lnte at " "comhoirinach\n" " leis an slonn SI." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Caith le gach comhad mar thacschomhad." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Dealaigh aisfhilleadh carriste gach lne ionchurtha." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Ligh agus scrobh sonra sa mhd dnrtha." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D AINM --ifdef=AINM Taispein comhad cumaiscthe chun na diff-a\n" " `#ifdef AINM' a liri" -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GCINL-group-format=GFMD Taispein grpa GCINL ionchuir de rir GFMD." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMD Taispein gach lne ionchuir de rir LFMD." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LCINL-line-format=LFMD Taispein lnte LCINL ionchuir de rir LFMD." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr " LCINL = `old', `new', n `unchanged'. GCINL = LCINL n `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -970,7 +975,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -983,7 +988,7 @@ msgstr "" " %l bhar na lne, gan aon lne nua\n" " %[-][LEITHEAD][.[SONR]]{doxX}n sonr do lne-uimhir mar C `printf'" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -997,94 +1002,102 @@ msgstr "" " %c'C' an carachtar litriil C\n" " %c'\\OOO' an carachtar le cd ochtnrtha OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Obair go crua le haghaidh nos l athruithe." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=UIMH Coinnigh UIMH lne den rimr/iarmhr choiteann." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" "-H --speed-large-files Comhaid mra agus go leor mionathruithe forleata." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Taispein eolas faoin leagan." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "COMHAID = `COMHAD1 COMHAD2' n `COMHADLANN1 COMHADLANN2' n `COMHADLANN " "COMHAD...' n `COMHAD... COMHADLANN'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "M t --from-file n --to-file tugtha, nl a leithid de shrian ar COMHAID." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Ms '-' an COMHAD, ligh n ionchur caighdenach." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "sid: %s [ROGHA]... COMHAID\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Dan comparid idir na comhaid, lne ar lne." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "luach contrrtha don rogha %s: `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "roghanna contrrtha le haghaidh na stle aschuir" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "I %s amhin: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "n fidir `-' a chur i gcomparid le comhadlann" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "Nl an rogha -D ar fil do chomhadlanna" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Fochomhadlanna i gcoitianta: %s agus %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "T comhad %s ina %s ach t comhad %s ina %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "T difrocht idir na comhaid %s agus %s\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Is comhionann iad na comhaid %s agus %s\n" @@ -1100,11 +1113,12 @@ msgid "incompatible options" msgstr "roghanna neamh-chomhoirinacha" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "bh `-' tugtha le haghaidh nos m n inchomhad amhin" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "theip ar lamh" @@ -1144,15 +1158,12 @@ msgid "" msgstr "-x --overlap-only Taispein na hathruithe forluiteacha." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Taispein na hathruithe neamhchumaiscthe agus cuir " -"coinbhleachta idir libn." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Cuir na horduithe `w' agus `q' le scripteanna `ed'." #: src/diff3.c:438 @@ -1192,9 +1203,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Caith le gach comhad mar thacschomhad." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1245,31 +1255,31 @@ msgstr "earrid inmhenach: cinel neamhbhail diff san fheidhm process_diff" msgid "invalid diff format; invalid change separator" msgstr "formid diff neamhbhail; teorantir neamhbhail idir athruithe" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "formid neamhbhail diff; lne deiridh neamhiomln" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "norbh fhidir an fochlr `%s' a rith" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "formid neamhbhail diff; carachtair mhchearta ag tosach na lne" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "" "earrid inmhenach: seachadadh cinel neamhbhail diff go dt an aschur" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "crapadh an t-inchomhad" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "" "n fidir na hainmneacha comhaid `%s' agus `%s' a chur i gcomparid le chile" @@ -1283,7 +1293,7 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" @@ -1291,127 +1301,134 @@ msgstr "" "-o COMHAD --output=COMHAD Md idirghnomhach, ag scrobh an aschuir i " "gCOMHAD." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case N b csogair." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Dan neamhshuim ar athruithe leathn na dtib." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Dan neamhshuim ar sps bn go hiomln." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Dan neamhshuim ar mhid an spis bn." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Dan neamhshuim ar sps bn go hiomln." +msgstr "-W --ignore-all-space Dan neamhshuim ar spsanna bn go hiomln." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Dan neamhshuim ar lnte folmha." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I SI --ignore-matching-lines=RE Dan neamhshuim ar lnte at " +"comhoirinach\n" +" leis an slonn SI." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Dealaigh aisfhilleadh carriste gach lne ionchurtha." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Caith le gach comhad mar thacschomhad." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w UIMH --width=UIMH UIMH coln priontla ar a mhad (ramhshocr=130)." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column N taispein an coln ar dheis ms ionann iad." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines N taispein lnte at i bpirt acu." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs leathnaigh tib go spsanna san aschur." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=UIMH Tbstop gach UIMH coln (ramhshocr=8)." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Obair go crua le haghaidh nos l athruithe." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" "-H --speed-large-files Comhaid mra agus go leor mionathruithe forleata." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" "--diff-program=CLR Bain sid as an CLR chun comhaid a chur i " "gcomparid." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Caith le gach comhad mar thacschomhad." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Taispein eolas faoin leagan." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "sid: %s [ROGHA]... COMHAD1 COMHAD2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Cumaisc difrochta idir na comhaid, taobh le taobh." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "n fidir an t-ionchur caighdenach a chumasc go hidirghnomhach" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "is comhadlanna iad na comhaid le cur i gcomparid" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1436,59 +1453,43 @@ msgstr "" "v:\tCuir comhlnte san ireamh go foclach.\n" "q:\tScoir.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: rogha neamhcheadaithe -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Is saorbhogearra an romhchlr seo; fach ar an bhunchd le haghaidh\n" +#~ "coinnollacha cipela. Nl barnta ar bith ann; go fi nl barnta ann\n" +#~ "d'INDOLTACHT n FEILINACHT DO FHEIDHM AR LEITH.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SCIP1:SCIP2 --ignore-initial=SCIP1:SCIP2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent N haschuir rud ar bith; gin stdas scortha." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Taispein eolas faoin leagan." - #~ msgid "--help Output this help." #~ msgstr "--help Taispein an chabhair seo.." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Cuir tr chomhad i gcomparid, lne ar lne." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Dan neamhshuim ar athruithe leathn na " -#~ "dtib." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Dan neamhshuim ar mhid an spis bn." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Dan neamhshuim ar spsanna bn go hiomln." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines Dan neamhshuim ar lnte folmha." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Seol tuairisc fabhtanna chuig <bug-gnu-utils@gnu.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Dealaigh aisfhilleadh carriste gach lne " -#~ "ionchurtha." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "t an rogha `-%ld' as feidhm; bain sid as `-%c %ld'" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Caith le gach comhad mar thacschomhad." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "t an rogha `-%ld' as feidhm; fg ar lr" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1501,10 +1502,6 @@ msgstr "" #~ " -F SI --show-function-line=SI Taispein an lne is dana at\n" #~ " comhoirinach leis an slonn SI." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Aschuir script `ed'." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1517,34 +1514,11 @@ msgstr "" #~ " --left-column N taispein ach an coln ar cl do lnte canna\n" #~ " --suppress-common-lines N taispein lnte canna." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs leathnaigh tib go spsanna san aschur." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Ailnigh tib tr thb a chur in ionad sps tosaigh." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=UIMH Tbstop gach UIMH coln (ramhshocr=8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Obair go crua le haghaidh nos l athruithe." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Comhaid mra agus go leor mionathruithe forleata." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Taispein gach athr agus cuir coinbhleachta idir " -#~ "libn." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Taispein na hathruithe forluiteacha, idir libn." @@ -1556,78 +1530,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L LIPAD --label=LIPAD sid LIPAD in ionad ainm comhaid." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=CLR Bain sid as an CLR chun comhaid a chur i " -#~ "gcomparid." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Dan neamhshuim ar spsanna bn go hiomln." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w UIMH --width=UIMH UIMH coln priontla ar a mhad (ramhshocr=130)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column N taispein an coln ar dheis ms ionann iad." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Comhaid mra agus go leor mionathruithe forleata." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "theip ar lamh" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "teipeadh ag scrobh" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "theip ar lamh" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "theip ar lamh" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "teipeadh ag scrobh" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "teipeadh ag scrobh" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: rogha neamhcheadaithe -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Is saorbhogearra an romhchlr seo; fach ar an bhunchd le haghaidh\n" -#~ "coinnollacha cipela. Nl barnta ar bith ann; go fi nl barnta ann\n" -#~ "d'INDOLTACHT n FEILINACHT DO FHEIDHM AR LEITH.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Seol tuairisc fabhtanna chuig <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "t an rogha `-%ld' as feidhm; bain sid as `-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "t an rogha `-%ld' as feidhm; fg ar lr" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "fochlr `%s' gan aimsi" @@ -1,19 +1,22 @@ # Galician translation of GNU diffutils -# Copyright 2000, 2001, 2002 Free Software Foundation, Inc. -# Jacobo Tarro Barreiro <jtarrio@trasno.net>, 2000, 2001, 2002. +# Copyright © 2000, 2001, 2002 Free Software Foundation, Inc. +# This file is distributed under the same license as the diffutils package. +# Jacobo Tarrío Barreiro <jtarrio@trasno.net>, 2000, 2001, 2002. +# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2011. +# Leandro Regueiro <leandro.regueiro@gmail.com>, 2011. # msgid "" msgstr "" -"Project-Id-Version: diffutils 2.8.3\n" +"Project-Id-Version: GNU diffutils 3.2\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2002-06-17 10:39+0200\n" -"Last-Translator: Jacobo Tarro Barreiro <jtarrio@trasno.net>\n" -"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2011-10-17 12:43+0100\n" +"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" +"Language-Team: Galician <proxecto@trasno.net>\n" "Language: gl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #: lib/c-stack.c:204 lib/c-stack.c:297 msgid "program error" @@ -23,17 +26,17 @@ msgstr "erro do programa" msgid "stack overflow" msgstr "desbordamento da pila" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" -msgstr "Erro do sistema descoecido" +msgstr "Produciuse un erro descoñecido do sistema" #: lib/file-type.c:38 msgid "regular empty file" -msgstr "ficheiro normal baleiro" +msgstr "ficheiro regular baleiro" #: lib/file-type.c:38 msgid "regular file" -msgstr "ficheiro normal" +msgstr "ficheiro regular" #: lib/file-type.c:41 msgid "directory" @@ -53,7 +56,7 @@ msgstr "fifo" #: lib/file-type.c:53 msgid "symbolic link" -msgstr "ligazn simblica" +msgstr "ligazón simbólica" #: lib/file-type.c:56 msgid "socket" @@ -65,7 +68,7 @@ msgstr "cola de mensaxes" #: lib/file-type.c:62 msgid "semaphore" -msgstr "semforo" +msgstr "semáforo" #: lib/file-type.c:65 msgid "shared memory object" @@ -77,219 +80,220 @@ msgstr "obxecto de memoria con tipo" #: lib/file-type.c:70 msgid "weird file" -msgstr "ficheiro raro" +msgstr "ficheiro estraño" #: lib/getopt.c:547 lib/getopt.c:576 #, fuzzy, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a opcin `%s' ambigua\n" +msgstr "'%s' está danado. A liña %d na sección Opción é incorrecta" #: lib/getopt.c:624 lib/getopt.c:628 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a opcin `--%s' non admite un parmetro\n" +msgstr "%s: a opción «--%s» non permite un argumento\n" #: lib/getopt.c:637 lib/getopt.c:642 -#, fuzzy, c-format +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: a opcin `%c%s' non admite un parmetro\n" +msgstr "%s: a opción «%c%s» non permite un argumento\n" #: lib/getopt.c:685 lib/getopt.c:704 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: a opcin `%s' precisa dun parmetro\n" +msgstr "%s: a opción «--%s» require un argumento\n" #: lib/getopt.c:742 lib/getopt.c:745 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opcin non recoecida `--%s'\n" +msgstr "%s: non se recoñece a opción «--%s»\n" #: lib/getopt.c:753 lib/getopt.c:756 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opcin non recoecida `%c%s'\n" +msgstr "%s: non se recoñece a opción «%c%s»\n" #: lib/getopt.c:805 lib/getopt.c:808 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: opcin incorrecta -- %c\n" +msgstr "%s: opción incorrecta -- «%c»\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: a opcin precisa dun parmetro -- %c\n" +msgstr "%s: a opción require un argumento -- «%c»\n" #: lib/getopt.c:934 lib/getopt.c:950 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a opcin `-W %s' ambigua\n" +msgstr "%s: a opción «-W %s» é ambigua\n" #: lib/getopt.c:974 lib/getopt.c:992 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a opcin `-W %s' non admite un parmetro\n" +msgstr "%s: a opción «-W %s» non permite un argumento\n" #: lib/getopt.c:1013 lib/getopt.c:1031 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a opcin `%s' precisa dun parmetro\n" +msgstr "%s: a opción «-W %s» require un argumento\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" -msgstr "" +msgstr "«" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" -msgstr "" +msgstr "»" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" -msgstr "xito" +msgstr "Correcto" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Non hai coincidencias" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" -msgstr "Expresin regular incorrecta" +msgstr "Expresión regular incorrecta" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" -msgstr "Carcter de ordeacin incorrecto" +msgstr "Carácter de ordenamento incorrecto" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" -msgstr "Nome de clase de caracteres incorrecto" +msgstr "Nome da clase de caracteres incorrecto" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Barra invertida ao final" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" -msgstr "Referencia cara a atrs incorrecta" +msgstr "Referencia cara a atrás incorrecta" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" -msgstr "[ ou [^ sen parella" +msgstr "[ ou [^ non emparellado" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" -msgstr "( ou \\( sen parella" +msgstr "( ou \\( non emparellado" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" -msgstr "\\{ sen parella" +msgstr "\\{ non emparellado" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "Contido de \\{\\} incorrecto" +msgstr "O contido entre \\{\\} non é correcto" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" -msgstr "Fin de rango incorrecto" +msgstr "Final do rango incorrecto" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria esgotada" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" -msgstr "Expresin regular precedente incorrecta" +msgstr "Expresión regular precedente incorrecta" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" -msgstr "Fin de expresin regular prematura" +msgstr "Final prematura da expresión regular" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" -msgstr "Expresin regular grande de mis" +msgstr "Expresión regular demasiado grande" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" -msgstr ") ou \\) sen parella" +msgstr ") ou \\) non emparellado" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" -msgstr "Non hai unha expresin regular anterior" +msgstr "Non hai unha expresión regular anterior" #: lib/xalloc-die.c:34 msgid "memory exhausted" -msgstr "memoria esgotada" +msgstr "esgotouse a memoria" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "entrada estándar" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "saída estándar" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "saída estándar de erro" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "Erro do sistema descoecido" +msgstr "fluxo descoñecido" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" -msgstr "" +msgstr "produciuse un erro ao volver abrir %s en modo %s" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" -msgstr "valor de --bytes `%s' non vlido" +msgid "invalid %s%s argument '%s'" +msgstr "o argumento «%s» de %s%s é incorrecto" #: lib/xstrtol-error.c:68 #, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "lonxitude do horizonte `%s' non vlida" +msgid "invalid suffix in %s%s argument '%s'" +msgstr "sufixo incorrecto %s%s no argumento «%s»" #: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument `%s' too large" -msgstr "" +#, fuzzy, c-format +msgid "%s%s argument '%s' too large" +msgstr "%s%s argumento «%s» demasiado longo" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Empaquetado por %s (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Empaquetado por %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "" +msgstr "©" #: lib/version-etc.c:86 msgid "" @@ -300,24 +304,30 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Licenza GPLv3+: GNU GPL versión 3 ou posterior <http://gnu.org/licenses/gpl." +"html>.\n" +"Isto é software libre: vostede é libre para modificalo e redistribuílo.\n" +"NON HAI GARANTÍA, ata o punto permitido pola lei.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Escrito por Thomas Lord." +msgstr "Escrito por %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:106 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" -msgstr "Escrito por Randy Smith." +msgstr "Escrito por %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:110 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "Escrito por Randy Smith." +msgstr "Escrito por %s, %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -328,6 +338,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -338,6 +350,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"%s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -348,6 +362,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"%s, %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -358,6 +374,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"%s, %s, %s, e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -369,6 +387,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"%s, %s, %s, %s,\n" +"e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -380,6 +401,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"%s, %s, %s, %s,\n" +"%s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -391,6 +415,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Escrito por %s, %s, %s\n" +"%s, %s, %s, %s,\n" +"%s, %s e outros.\n" #. TRANSLATORS: The placeholder indicates the bug-reporting address #. for this package. Please add _another line_ saying @@ -402,27 +429,29 @@ msgid "" "\n" "Report bugs to: %s\n" msgstr "" +"\n" +"Envíe os informes de erros a: %s\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "" +msgstr "Envíe %s informes de erros a: %s\n" #: lib/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "%s páxina web: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -msgstr "" +msgstr "%s páxina web: <http://www.gnu.org/software/%s/>\n" #: lib/version-etc.c:256 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" -msgstr "" +msgstr "Axuda xeral ao usar software GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Os ficheiros %s e %s son diferentes\n" @@ -432,56 +461,56 @@ msgstr "Os ficheiros %s e %s son diferentes\n" msgid "Binary files %s and %s differ\n" msgstr "Os ficheiros binarios %s e %s son diferentes\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" -msgstr "Non hai un salto de lia na fin da lia" +msgstr "Non hai un salto de liña na fin da liña" #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:43 msgid "Torbjorn Granlund" -msgstr "" +msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:44 msgid "David MacKenzie" -msgstr "" +msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." -msgstr "Escriba `%s --help' para obter mis informacin." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." +msgstr "Probe «%s --help» para obter máis información." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "valor de --ignore-initial `%s' non vlido" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" +msgstr "valor de --ignore-initial «%s» non válido" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" -msgstr "as opcins -l e -s son incompatibles" +msgstr "as opcións -l e -s son incompatíbeis" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "fallou a escritura" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" -msgstr "sada estndar" +msgstr "saída estándar" #: src/cmp.c:161 #, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes Amosa-los bytes diferentes." +msgstr "Axustar a resolución de impresión" #: src/cmp.c:162 #, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "" -"-i N --ignore-initial=N Omiti-los primeiros N bytes de entrada." +"-i N --ignore-initial=N Omitir os primeiros N bytes de entrada." #: src/cmp.c:163 #, fuzzy @@ -489,18 +518,18 @@ msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" -" Omiti-los primeiros N1 bytes de FICH1 e os primeiros N2 bytes de FICH2." +" Omitir os primeiros N1 bytes de FICH1 e os primeiros N2 bytes de FICH2." #: src/cmp.c:165 #, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" -msgstr "-l --verbose Amosa-los nmeros e valores dos bytes que difiran." +msgstr "-l --verbose Amosar os números e valores dos bytes que difiran." #: src/cmp.c:166 #, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n LMITE --bytes=LMITE Comparar como moito LMITE bytes." +msgstr "-n LÍMITE --bytes=LÍMITE Comparar como moito LÍMITE bytes." #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" @@ -513,12 +542,12 @@ msgstr "" #: src/cmp.c:169 #, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Amosar informacin sobre a versin." +msgstr "Mostrar información da versión e saír" #: src/cmp.c:178 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" -msgstr "Uso: %s [OPCIN]... FICH1 [FICH2 [N1 [N2]]]\n" +msgstr "Uso: %s [OPCIÓN]... FICH1 [FICH2 [N1 [N2]]]\n" #: src/cmp.c:180 msgid "Compare two files byte by byte." @@ -529,9 +558,9 @@ msgstr "Comparar dous ficheiros byte a byte." msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." -msgstr "N1 e N2 son o nmero de bytes a omitir en cada ficheiro." +msgstr "N1 e N2 son o número de bytes a omitir en cada ficheiro." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -544,386 +573,399 @@ msgid "" msgstr "" "Os valores N poden estar seguidos polos seguintes sufixos multiplicativos:\n" "kB 1000, K 1024, MB 1.000.000, M 1.048.576,\n" -"GB 1.000.000.000, G 1.073.741.824, e as para T, P, E, Z e Y." +"GB 1.000.000.000, G 1.073.741.824, e así para T, P, E, Z e Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Se un FICHEIRO `-' ou non se indica, lese da entrada estndar." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Se un FICHEIRO é «-» ou non se indica, lese da entrada estándar." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" +"O estado de saída é 0 se as entradas son iguais, 1 se son diferentes, 2 en " +"caso de problema." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" -msgstr "valor de --bytes `%s' non vlido" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" +msgstr "valor de --bytes «%s» non válido" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" -msgstr "falta un operando despois de `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" +msgstr "falta un operando despois de «%s»" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" -msgstr "operando `%s' sobrante" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" +msgstr "operando «%s» sobrante" #: src/cmp.c:491 #, c-format msgid "%s %s differ: byte %s, line %s\n" -msgstr "%s %s son diferentes: byte %s, lia %s\n" +msgstr "%s %s son diferentes: byte %s, liña %s\n" #: src/cmp.c:507 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" -msgstr "%s %s son diferentes: byte %s, lia %s %3o %s %3o %s\n" +msgstr "%s %s son diferentes: byte %s, liña %s é %3o %s %3o %s\n" #: src/cmp.c:559 #, c-format msgid "cmp: EOF on %s\n" -msgstr "cmp: Fin de Ficheiro en %s\n" +msgstr "cmp: Fin de ficheiro en %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" -msgstr "" +msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" -msgstr "" +msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" -msgstr "" +msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" -msgstr "" +msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" -msgstr "" +msgstr "Len Tower" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" -msgstr "lonxitude do contexto `%s' non vlida" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" +msgstr "lonxitude do contexto «%s» non válida" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" -msgstr "a paxinacin non est soportada nesta mquina" +msgstr "a paxinación non está admitida nesta máquina" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" -msgstr "demasiadas opcins de etiquetas de ficheiro" +msgstr "demasiadas opcións de etiquetas de ficheiro" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" -msgstr "ancho `%s' non vlido" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" +msgstr "largo «%s» non válido" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" -msgstr "opcins de anchura conflictivas" +msgstr "opcións de largura conflitivas" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" -msgstr "lonxitude do horizonte `%s' non vlida" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" +msgstr "lonxitude do horizonte «%s» non válida" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" -msgstr "ancho de tabulacin `%s' non vlido" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" +msgstr "tamaño de tabulación «%s» non válido" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" -msgstr "opcins de anchura de tabulacin conflictivas" +msgstr "opcións de tamaño de tabulación conflitivas" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" -msgstr "Especificronse --from-file e --to-file ao mesmo tempo" +msgstr "Especificáronse --from-file e --to-file ao mesmo tempo" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" -msgstr "--normal Producir un diff normal." +msgstr "Aparencia predefinida no modo normal" -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" -msgstr "-q --brief Producir unha sada s se os ficheiros teen diferencias." +msgstr "-q --brief Producir unha saída só se os ficheiros teñen diferencias." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Informar cando dous ficheiros son o mesmo." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr "-w NM --width=NM Amosar como moito NM columnas (130 por defecto)." +msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" -msgstr "-w NM --width=NM Amosar como moito NM columnas (130 por defecto)." +msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Tratar tdolos ficheiros coma texto" +msgstr "Gardar a saída da consola de Script-Fu" -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Producir un diff en formato RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Amosar informacin sobre a versin." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" -msgstr "-w NM --width=NM Amosar como moito NM columnas (130 por defecto)." +msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column Amosar s a columna da esquerda nas lias comns." +msgstr "-l --left-column Amosar só a columna da esquerda nas liñas comúns." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-llines Non amosa-las lias comns." +msgstr "-s --suppress-common-lines Non amosar as liñas comúns." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs Expandi-las tabulacins a espacios na sada." +msgstr "-t --expand-tabs Expandir as tabulacións a espazos na saída." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Facer que as tabulacins queden aliadas poendo outra\n" -" tabulacin ao principio da lia." +"-T --initial-tab Facer que as tabulacións queden aliñadas poñendo outra\n" +" tabulación ao principio da liña." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" -msgstr "--tabsize=NM Tabulacins de NM columnas (8 por defecto)." +msgstr "--tabsize=NÚM Tabulacións de NÚM columnas (8 por omisión)." -#: src/diff.c:871 +#: src/diff.c:874 +#, fuzzy msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" +"--suppress-blank-empty Suprime espazos ou tabuladores antes dunha liña " +"baleira." -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" -msgstr "-l --paginate Pasa-la sada por `pr' para paxinala." +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "-l --paginate Pasar a saída por «pr» para paxinala." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Comparar recursivamente os subdirectorios que se atopen." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file Trata-los ficheiros ausentes coma baleiros." +msgstr "-N --new-file Tratar os ficheiros ausentes como baleiros." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -"--unidirectional-new-file Tratar ficheiros vellos ausentes coma baleiros." +"--unidirectional-new-file Tratar os ficheiros antigos ausentes como\r\n" +"a baleiros." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -"--ignore-file-name-case Ignorar maisculas/minsculas no nome do ficheiro." +"--ignore-file-name-case Ignorar maiúsculas/minúsculas no nome do ficheiro." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -"--no-ignore-file-name-case Ter en conta as maisculas/minsculas\n" -" ao compara-los nomes dos ficheiros." +"--no-ignore-file-name-case Ter en conta as maiúsculas/minúsculas\r\n" +" ao comparar os nomes dos ficheiros." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" -msgstr "-x PAT --exclude=PAT Exclui-los ficheiros que coinciden co PATrn." +msgstr "-x MOD --exclude=MOD Excluír os ficheiros que coinciden co MODelo." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X FICH --exclude-from=FICH Excluir ficheiros que coinciden con algn\n" -" patrn do FICHeiro." +"-X FICH --exclude-from=FICH Excluír ficheiros que coinciden con algún\r\n" +" modelo do FICHeiro." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S FICH --starting-file=FICH Comezar no FICHeiro ao comparar directorios." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=FICH1 Comparar FICH1 con tdolos operandos. Pode ser directorio." +"--from-file=FICH1 Comparar FICH1 con todos os operandos. Pode ser " +"directorio." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=FICH2 Comparar tdolos operandos con FICH2. Pode ser un " +"--to-file=FICH2 Comparar todos os operandos con FICH2. Pode ser un " "directorio." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -"-i --ignore-case Ignorar maisculas/minsculas no contido do ficheiro." +"-i --ignore-case Ignorar maiúsculas/minúsculas no contido do ficheiro." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Ignora-los cambios pola expansin de tabulacins." +"-E --ignore-tab-expansion Ignorar os cambios pola expansión de tabulacións." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Ignorar tdolos espacios en branco." +msgstr "-w --ignore-all-space Ignorar todos os espazos en branco." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "" -"-b --ignore-space-change Ignora-los cambios na cantidade de espacios." +msgstr "-b --ignore-space-change Ignorar os cambios na cantidade de espazos." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignorar tdolos espacios en branco." +msgstr "Todo visíbel (ignorar patrón)" -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B --ignore-blank-lines Ignora-los cambios que tean tdalas lias en " +"-B --ignore-blank-lines Ignorar os cambios que teñan todas as liñas en " "branco" -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I RE --ignore-matching-lines=RE Ignora-los cambios nos que tdalas lias\n" -" contean RE." +"-I EXPR-REG --ignore-matching-lines=EXPR-REG Ignorar os cambios nos que " +"todas as liñas\r\n" +" conteñan EXPR-REG." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Tratar tdolos ficheiros coma texto" +msgstr "-a --text Tratar todos os ficheiros como texto" -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimina-los retornos de carro fin das lias de " +"--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de " "entrada." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Ler e escribir datos en modo binario." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D NOME -ifdef=NOME Amosa-lo ficheiro mesturado con diffs `#ifdef NOME'." +"-D NOME -ifdef=NOME Amosar o ficheiro mesturado con diffs «#ifdef NOME»." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -"--GTYPE-group-format=GFMT Similar, pero formata-los grupos de entrada " -"GTYPE\n" +"--GTYPE-group-format=GFMT Similar, mais formatar os grupos de entrada GTYPE" +"\r\n" " con GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -"--line-format=LFMT Similar, pero formatar tdalas lias de entrada con LFMT." +"--line-format=LFMT Similar, mais formatar todas as liñas de entrada con " +"LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -"--LTYPE-line-format=LFMT Similar, pero formata-las lias de entrada LTYPE\n" +"--LTYPE-line-format=LFMT Similar, mais formatar as liñas de entrada LTYPE" +"\r\n" " con LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYPE `old' (vello), `new' (novo) ou `unchanged' (sen cambios).\n" -" GTYPE LTYPE ou `changed' (con cambios)." +" LTYPE é «old» (antigo), «new» (novo) ou «unchanged» (sen cambios).\r\n" +" GTYPE é LTYPE ou «changed» (con cambios)." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -940,20 +982,20 @@ msgid "" " %(A=B?T:E) if A equals B then T else E" msgstr "" " GFMT pode conter:\n" -" %< lias do FICH1\n" -" %> lias do FICH2\n" -" %= lias comns a FICH1 e FICH2\n" -" %[-][ANCHO][.[PREC]]{doxX}LETRA especificacin estilo printf para a " +" %< liñas do FICH1\n" +" %> liñas do FICH2\n" +" %= liñas comúns a FICH1 e FICH2\n" +" %[-][ANCHO][.[PREC]]{doxX}LETRA especificación estilo printf para a " "LETRA\n" -" As LETRAs son como segue para o novo grupo, en minsculas para o " -"vello:\n" -" F nmero da primeira lia\n" -" L nmero da derradeira lia\n" -" N nmero de lias = L-F+1\n" +" As LETRAs son como segue para o novo grupo, en minúsculas para o " +"antigo:\n" +" F número da primeira liña\n" +" L número da última liña\n" +" N número de liñas = L-F+1\n" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -962,11 +1004,11 @@ msgid "" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" " LFMT pode conter:\n" -" %L contido da lia\n" -" %l contido da lia, exclundo os saltos de lia finais\n" -" %[-][ANCHO][.[PREC]]{doxX}n especif. estilo printf do nmero da lia" +" %L contido da liña\n" +" %l contido da liña, excluíndo os saltos de liña finais\n" +" %[-][ANCHO][.[PREC]]{doxX}n especif. estilo printf do número da liña" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -977,20 +1019,20 @@ msgid "" msgstr "" " GFMT e LFMT poden conter:\n" " %% %\n" -" %c'C' o carcter C\n" -" %c'\\OOO' o carcter de cdigo octal OOO" +" %c«C» o carácter C\n" +" %c«\\OOO» o carácter de código octal OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Procurar atopa-lo conxunto de cambios mis pequeno." +msgstr "-d --minimal Procurar atopar o conxunto de cambios máis pequeno." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" -msgstr "--horizon-lines=NUM Manter NUM lias do prefixo e sufixo comns." +msgstr "--horizon-lines=NUM Manter NUM liñas do prefixo e sufixo comúns." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -998,97 +1040,105 @@ msgstr "" "-H --speed-large-files Asumir ficheiros longos e pequenos cambios " "dispersos." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Amosar informacin sobre a versin." +msgstr "Mostrar información da versión e saír" -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"Os FICHEIROS son `FICH1 FICH2', `DIR1 DIR2', `DIR FICH...' ou `FICH... DIR'." +"Os FICHEIROS son «FICH1 FICH2», «DIR1 DIR2», «DIR FICH...» ou «FICH... DIR»." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -"Se se indica --from-file ou --to-file, non hai restriccins nos FICHEIROS." +"Se se indica --from-file ou --to-file, non hai restricións nos FICHEIROS." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Se un FICHEIRO `-', lese da entrada estndar." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." +msgstr "Se un FICHEIRO é «-», lese da entrada estándar." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" -msgstr "Uso: %s [OPCIN]... FICHEIROS\n" +msgstr "Uso: %s [OPCIÓN]... FICHEIROS\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." -msgstr "Compara-los ficheiros lia a lia." +msgstr "Comparar os ficheiros liña a liña." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" -msgstr "valor `%1$s' da opcin %2$s conflictivo" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" +msgstr "valor «%1$s» da opción %2$s conflitivo" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" -msgstr "opcins de estilo da sada conflictivas" +msgstr "opcións de estilo da saída conflitivas" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" -msgstr "S en %s: %s\n" +msgstr "Só en %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "non se pode comparar `-' cun directorio" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" +msgstr "non se pode comparar «-» cun directorio" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" -msgstr "A opcin -D non est soportada con directorios" +msgstr "A opción -D non está admitida con directorios" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" -msgstr "Subdirectorios comns: %s e %s\n" +msgstr "Subdirectorios comúns: %s e %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" -msgstr "O ficheiro %s un %s mentres que o ficheiro %s un %s\n" +msgstr "O ficheiro %s é un %s mentres que o ficheiro %s é un %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Os ficheiros %s e %s son diferentes\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" -msgstr "Os ficheiros %s e %s son idnticos\n" +msgstr "Os ficheiros %s e %s son idénticos\n" #. This is a proper name. See the gettext manual, section Names. #: src/diff3.c:41 -#, fuzzy msgid "Randy Smith" -msgstr "Escrito por Randy Smith." +msgstr "Randy Smith" #: src/diff3.c:313 #, c-format msgid "incompatible options" -msgstr "opcins incompatibles" +msgstr "opcións incompatíbeis" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "Especificouse `-' para mis dun ficheiro de entrada" +#, fuzzy +msgid "'-' specified for more than one input file" +msgstr "Especificouse «-» para máis dun ficheiro de entrada" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "fallou a lectura" @@ -1096,7 +1146,7 @@ msgstr "fallou a lectura" #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -"-a --show-all Amosar tdolos cambios, cos conflictos entre corchetes." +"-a --show-all Amosar todos os cambios, cos conflitos entre parénteses." #: src/diff3.c:430 #, fuzzy @@ -1104,39 +1154,36 @@ msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed Producir cambios sen mesturar de FICHVELLO a TEUFICH en MEUFICH." +"-e --ed Produce cambios sen mesturar de FICH-ANTIGO a TEU-FICH en MEU-FICH." #: src/diff3.c:432 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" -"-E --show-overlap Amosar cambios sen mesturar cos conflictos entre " -"corchetes" +"-E --show-overlap Amosar cambios sen mesturar cos conflitos entre " +"parénteses." #: src/diff3.c:433 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" -msgstr "-3 --easy-only Amosar cambios non solapados e non mesturados." +msgstr "-3 --easy-only Amosar cambios non sobrepostos e non mesturados." #: src/diff3.c:434 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only Amosa-los cambios que se superpoen." +msgstr "-x --overlap-only Amosar los cambios que se superpoñen." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Amosar cambios sen mesturar cos conflictos entre " -"corchetes" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i Engadi-los comandos `w' e `q' aos scripts en ed." +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "-i Engadir as ordes «w» e «q» aos scripts en ed." #: src/diff3.c:438 msgid "" @@ -1147,27 +1194,27 @@ msgstr "" #: src/diff3.c:441 #, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Tratar tdolos ficheiros coma texto" +msgstr "-a --text Tratar todos os ficheiros como texto" #: src/diff3.c:442 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimina-los retornos de carro fin das lias de " +"--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de " "entrada." #: src/diff3.c:443 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Facer que as tabulacins queden aliadas poendo outra\n" -" tabulacin ao principio da lia." +"-T --initial-tab Facer que as tabulacións queden aliñadas poñendo outra\n" +" tabulación ao principio da liña." #: src/diff3.c:444 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=PROGRAMA Emprega-lo PROGRAMA para compara-los ficheiros." +"--diff-program=PROGRAMA Empregar o PROGRAMA para comparar os ficheiros." #: src/diff3.c:445 msgid "" @@ -1176,23 +1223,22 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Tratar tdolos ficheiros coma texto" +msgstr "" #: src/diff3.c:449 #, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Amosar informacin sobre a versin." +msgstr "Mostrar información da versión e saír" #: src/diff3.c:458 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -msgstr "Uso: %s [OPCIN]... MEUFICH VELLOFICH TEUFICH\n" +msgstr "Uso: %s [OPCIÓN]... MEU-FICH ANTIGO-FICH TEU-FICH\n" #: src/diff3.c:460 msgid "Compare three files line by line." -msgstr "Comparar tres ficheiros lia a lia." +msgstr "Comparar tres ficheiros liña a liña." #: src/diff3.c:470 msgid "" @@ -1211,6 +1257,8 @@ msgstr "" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" +"O estado de saída é 0 se é correcto, 1 se hai conflitos, 2 en caso de " +"problema." #: src/diff3.c:675 msgid "internal error: screwup in format of diff blocks" @@ -1223,140 +1271,146 @@ msgstr "%s: diff fallou: " #: src/diff3.c:990 msgid "internal error: invalid diff type in process_diff" -msgstr "erro interno: tipo de diff non vlido en process_diff" +msgstr "erro interno: tipo de diff non válido en process_diff" #: src/diff3.c:1015 msgid "invalid diff format; invalid change separator" -msgstr "formato de diff non vlido; separador de cambios non vlido" +msgstr "formato de diff non válido; separador de cambios non válido" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" -msgstr "formato de diff non vlido: derradeira lia incompleta" +msgstr "formato de diff non válido: última liña incompleta" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, fuzzy, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "non se atopou o programa subsidiario `%s'" +msgid "subsidiary program '%s' could not be invoked" +msgstr "non foi posíbel invocar o programa subsidiario «%s»" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" -msgstr "formato de diff non vlido: caracteres a principio de lia incorrectos" +msgstr "formato de diff non válido: caracteres a principio de liña incorrectos" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" -msgstr "erro interno_ tipo de diff non vlido pasado sada" +msgstr "erro interno_ tipo de diff non válido pasado á saída" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" -msgstr "o ficheiro de entrada encolleu" +msgstr "o ficheiro de entrada minguou" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "non se poden compara-los ficheiros `%s' e `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" +msgstr "non se poden comparar os ficheiros «%s» e «%s»" #: src/dir.c:209 #, c-format msgid "%s: recursive directory loop" -msgstr "" +msgstr "%s: bucle de directorio recursivo" #. This is a proper name. See the gettext manual, section Names. #: src/sdiff.c:42 -#, fuzzy msgid "Thomas Lord" -msgstr "Escrito por Thomas Lord." +msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" -"-o FICH --output=FICH Operar interactivamente, mandando a sada ao " +"-o FICH --output=FICH Operar interactivamente, enviando a saída ao " "FICHeiro." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" -"-i --ignore-case Ignora-las diferencias entre maisculas e minsculas." +"-i --ignore-case Ignorar as diferencias entre maiúsculas e minúsculas." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Ignora-los cambios pola expansin de tabulacins." +"-E --ignore-tab-expansion Ignorar os cambios pola expansión de tabulacións." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Ignorar tdolos espacios en branco." +msgstr "-w --ignore-all-space Ignorar todos os espazos en branco." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "" -"-b --ignore-space-change Ignora-los cambios na cantidade de espacios." +msgstr "-b --ignore-space-change Ignorar os cambios na cantidade de espazos." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignorar tdolos espacios en branco." +msgstr "Todo visíbel (ignorar patrón)" -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B --ignore-blank-lines Ignora-los cambios que tean tdalas lias en " +"-B --ignore-blank-lines Ignorar os cambios que teñan todas as liñas en " "branco" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I EXPR-REG --ignore-matching-lines=EXPR-REG Ignorar os cambios nos que " +"todas as liñas\r\n" +" conteñan EXPR-REG." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimina-los retornos de carro fin das lias de " +"--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de " "entrada." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Tratar tdolos ficheiros coma texto" +msgstr "-a --text Tratar todos os ficheiros como texto" -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" -msgstr "-w NM --width=NM Amosar como moito NM columnas (130 por defecto)." +msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column Amosar s a columna da esquerda nas lias comns." +msgstr "-l --left-column Amosar só a columna da esquerda nas liñas comúns." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-llines Non amosa-las lias comns." +msgstr "-s --suppress-common-lines Non amosar as liñas comúns." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs Expandi-las tabulacins a espacios na sada." +msgstr "-t --expand-tabs Expandir as tabulacións a espazos na saída." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" -msgstr "--tabsize=NM Tabulacins de NM columnas (8 por defecto)." +msgstr "--tabsize=NÚM Tabulacións de NÚM columnas (8 por omisión)." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Procurar atopa-lo conxunto de cambios mis pequeno." +msgstr "-d --minimal Procurar atopar o conxunto de cambios máis pequeno." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1364,42 +1418,40 @@ msgstr "" "-H --speed-large-files Asumir ficheiros longos e pequenos cambios " "dispersos." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=PROGRAMA Emprega-lo PROGRAMA para compara-los ficheiros." +"--diff-program=PROGRAMA Empregar o PROGRAMA para comparar os ficheiros." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Tratar tdolos ficheiros coma texto" +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Amosar informacin sobre a versin." +msgstr "Mostrar información da versión e saír" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Uso: %s [OPCIN]... FICH1 FICH2\n" +msgstr "Uso: %s [OPCIÓN]... FICH1 FICH2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Mestura en das columnas das diferencias entre os ficheiros." +msgstr "Mestura en dúas columnas das diferencias entre os ficheiros." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" -msgstr "non se pode mestura-la entrada estndar interactivamente" +msgstr "non se pode mesturar a entrada estándar interactivamente" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" -msgstr "mbolos dous ficheiros a ser comparados son directorios" +msgstr "ámbolos dous ficheiros a ser comparados son directorios" -#: src/sdiff.c:827 -#, fuzzy +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1412,88 +1464,44 @@ msgid "" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr "" -"ed:\tEditar e usar mbalas das versins, cada unha cunha cabeceira.\n" -"eb:\tEditar e usar mbalas das versins.\n" -"el:\tEditar e logo usa-la versin da esquerda.\n" -"er:\tEditar e logo usa-la versin da dereita.\n" -"e:\tEditar unha nova versin.\n" -"l:\tusa-la versin da esquerda.\n" -"r:\tusa-la versin da dereita.\n" -"e:\tEditar unha nova versin.\n" -"s:\tInclui-las lias comns silenciosamente.\n" -"v:\tInclui-las lias comns faladoramente.\n" -"q:\tSair.\n" +"ed:\tEdita e usa ambas versións, cada unha decorada cunha cabeceira.\n" +"eb:\tEdita e usa ambas versións.\n" +"el ou e1:\tEdita e usa a versión esquerda.\n" +"er ou e2:\tEdita e usa a versión dereita.\n" +"e:\tEdita unha nova versión.\n" +"l ou 1:\tUsa a versión esquerda.\n" +"r ou 2:\tUsa a versión dereita.\n" +"s: Inclúe liñas comúns silenciosamente.\n" +"v: Inclúe liñas comúns de xeito detallado.\n" +"q: Saír.\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i N1:N2 --ignore-initial=N1:N2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." -#~ msgstr "-s --quiet --silent Non producir nada; s da-lo estado de sada." - -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Amosar informacin sobre a versin." +#~ msgstr "-s --quiet --silent Non producir nada; só dar o estado de saída." #~ msgid "--help Output this help." #~ msgstr "--help Amosar esta axuda." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Comparar tres ficheiros lia a lia." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignora-los cambios pola expansin de " -#~ "tabulacins." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Ignora-los cambios na cantidade de espacios." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorar tdolos espacios en branco." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Ignora-los cambios que tean tdalas lias en " -#~ "branco" - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Elimina-los retornos de carro fin das lias de " -#~ "entrada." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Tratar tdolos ficheiros coma texto" - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" -#~ "-c -C NM --context[=NM] Amosar NM [3] lias de contexto copiado.\n" -#~ "-u -U NM --unified[=NM] Amosar NM [3] lias de contexto unificado.\n" -#~ " --label ETIQUETA Usa-la ETIQUETA no canto do nome do ficheiro.\n" -#~ " -p --show-c-function Amosar en que funcin C est cada cambio.\n" -#~ " -F RE --show-function-line=RE Amosa-la lia mis recente que " -#~ "coincide\n" -#~ " con RE." - -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Producir un script de ed." +#~ "-c -C NÚM --context[=NÚM] Amosar NÚM (3 por omisión) liñas de contexto " +#~ "copiado.\n" +#~ "-u -U NÚM --unified[=NÚM] Amosar NÚM (3 por omisión) liñas de contexto " +#~ "unificado.\n" +#~ " --label ETIQUETA Usar a ETIQUETA no canto do nome do ficheiro.\n" +#~ " -p --show-c-function Amosar en que función C está cada cambio.\n" +#~ " -F EXPR-REG --show-function-line=EXPR-REG Amosar a liña máis recente " +#~ "que coincide\n" +#~ " con EXPR-REG." #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" @@ -1501,104 +1509,31 @@ msgstr "" #~ " --left-column Output only the left column of common lines.\n" #~ " --suppress-common-lines Do not output common lines." #~ msgstr "" -#~ "-y --side-by-side Produci-la sada en das columnas.\n" -#~ " -w NM --width=NM Amosar como moito NM [130] columnas de " -#~ "impresin.\n" -#~ " --left-column Amosar s a columna da esquerda nas lias comns.\n" -#~ " --suppress-common-lines Non amosa-las lias comns." - -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Expandi-las tabulacins a espacios na sada." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Facer que as tabulacins queden aliadas poendo " -#~ "outra\n" -#~ " tabulacin ao principio da lia." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=NM Tabulacins de NM columnas (8 por defecto)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Procurar atopa-lo conxunto de cambios mis pequeno." +#~ "-y --side-by-side Producir a saída en dúas columnas.\n" +#~ " -w NÚM --width=NÚM Amosar como moito NÚM (130 por omisión) columnas " +#~ "de impresión.\n" +#~ " --left-column Amosar só a columna da esquerda nas liñas comúns.\n" +#~ " --suppress-common-lines Non amosar as liñas comúns." #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Asumir ficheiros longos e pequenos cambios dispersos." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-a --show-all Amosar tdolos cambios, cos conflictos entre corchetes." - #~ msgid "-X Output overlapping changes, bracketing them." -#~ msgstr "-X Amosa-los cambios que se solapen, pondoos entre corchetes." +#~ msgstr "" +#~ "-X Amosar os cambios que se sobrepoñan, poñéndoos entre parénteses." #~ msgid "-m --merge Output merged file instead of ed script (default -A)." #~ msgstr "" -#~ "-m --merge Amosa-lo ficheiro mesturado no canto dun script en ed [-A]." +#~ "-m --merge Amosar o ficheiro mesturado no canto dun script en ed [-A]." #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "" -#~ "-L ETIQ --label=ETIQ Usa-la ETIQueta no canto do nome do ficheiro." - -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=PROGRAMA Emprega-lo PROGRAMA para compara-los ficheiros." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorar tdolos espacios en branco." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NM --width=NM Amosar como moito NM columnas (130 por defecto)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Amosar s a columna da esquerda nas lias comns." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Asumir ficheiros longos e pequenos cambios dispersos." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "fallou a lectura" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "fallou a escritura" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "fallou a lectura" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "fallou a lectura" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "fallou a escritura" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "fallou a escritura" +#~ "-L ETIQ --label=ETIQ Usar a ETIQueta no canto do nome do ficheiro." #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: opcin non permitida -- %c\n" +#~ msgstr "ón non permitida -- %c\n" #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" @@ -1606,92 +1541,60 @@ msgstr "" #~ "under the terms of the GNU General Public License.\n" #~ "For more information about these matters, see the files named COPYING." #~ msgstr "" -#~ "Este programa vn SEN GARANTA, ata o permitido pola lei.\n" -#~ "Pode redistribur copias deste programa baixo os termos\n" -#~ "da Licencia Pblica Xeral de GNU.\n" -#~ "Para mis informacin sobre estas materias, vexa o ficheiro chamado " -#~ "COPYING." +#~ "én SEN GARANTÍA, ata o permitido pola lei.\n" +#~ "ír copias deste programa baixo os termos\n" +#~ "ública Xeral de GNU.\n" +#~ "áis información sobre estas materias, vexa o ficheiro chamado COPYING." #~ msgid "Written by Torbjorn Granlund and David MacKenzie." -#~ msgstr "Escrito por Torbjrn Granlund e David MacKenzie." +#~ msgstr "örn Granlund e David MacKenzie." #~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." #~ msgstr "" -#~ "Informe dos erros no programa a <bug-gnu-utils@gnu.org>.\n" -#~ "Informe dos erros na traduccin a <proxecto@trasno.net>." +#~ "\n" +#~ "ón a <proxecto@trasno.net>." #~ msgid "" #~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" #~ "Richard Stallman, and Len Tower." -#~ msgstr "" -#~ "Escrito por Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman e Len Tower." +#~ msgstr "\n" #~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "A opcin `-%ld' obsoleta; empregue `-%c %ld'" +#~ msgstr "ón `-%ld' é obsoleta; empregue `-%c %ld'" #~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "A opcin `-%ld' obsoleta; omtaa" - -#~ msgid "subsidiary program `%s' failed" -#~ msgstr "fallou o programa subsidiario `%s'" +#~ msgstr "ón `-%ld' é obsoleta; omítaa" #~ msgid "subsidiary program `%s' not executable" -#~ msgstr "o programa subsidiario `%s' non executable" +#~ msgstr "é executable" #~ msgid "" #~ "SKIP values may be followed by the following multiplicative suffixes:\n" -#~ msgstr "" -#~ "Os valores de N poden ir seguidos polos seguintes sufixos " -#~ "multiplicativos:\n" +#~ msgstr "\n" #~ msgid "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" -#~ msgstr "kB 1000, K 1024, MB 1.000.000, M 1.048.576,\n" +#~ msgstr "\n" #~ msgid "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y.\n" -#~ msgstr "GB 1.000.000.000, G 1.073.741.824 e as para T, P, E, Z e Y.\n" +#~ msgstr "í para T, P, E, Z e Y.\n" #~ msgid "Report bugs to <bug-gnu-utils@gnu.org>.\n" -#~ msgstr "Informe dos erros a <bug-gnu-utils@gnu.org>.\n" +#~ msgstr "\n" #~ msgid "context length specified twice" -#~ msgstr "a lonxitude do contexto especificouse das veces" +#~ msgstr "úas veces" #~ msgid "multiple `--from-file' options" -#~ msgstr "opcins `--from-file' mltiples" +#~ msgstr "óns `--from-file' múltiples" #~ msgid "multiple `--to-file' options" -#~ msgstr "opcins `--to-file' mltiples" - -#~ msgid "--inhibit-hunk-merge Do not merge hunks." -#~ msgstr "--inhibit-hunk-merge Non mesturar anacos" - -#~ msgid "regular empty executable file" -#~ msgstr "ficheiro normal executable baleiro" - -#~ msgid "regular executable file" -#~ msgstr "ficheiro normal executable" +#~ msgstr "óns `--to-file' múltiples" #~ msgid "If a FILE is `-', read standard input.\n" -#~ msgstr "Se un FICHEIRO `-', lese da entrada estndar.\n" - -#~ msgid "--ignore-initial value must be a nonnegative integer" -#~ msgstr "O valor de --ignore-initial debe ser un enteiro non negativo" +#~ msgstr "é `-', lese da entrada estándar.\n" #~ msgid ": not found\n" -#~ msgstr ": non atopado\n" - -#~ msgid "column width must be a positive integer" -#~ msgstr "o ancho da columna debe ser un enteiro positivo" - -#~ msgid "conflicting group format" -#~ msgstr "formato de grupo con conflictos" +#~ msgstr "\n" #~ msgid "conflicting line format" -#~ msgstr "formato de lia con conflictos" - -#~ msgid "context length must be a nonnegative integer" -#~ msgstr "a lonxitude do contexto debe ser un enteiro non negativo" - -#~ msgid "horizon must be a nonnegative integer" -#~ msgstr "o horizonte debe ser un enteiro non negativo" +#~ msgstr "ña con conflictos" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.3\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2002-06-17 13:03+0300\n" "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n" "Language-Team: Hebrew <eliz@gnu.org>\n" @@ -23,7 +23,7 @@ msgstr " " msgid "stack overflow" msgstr " " -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "- " @@ -136,100 +136,102 @@ msgstr "%s `%s' \n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr " " -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr " " -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "- " -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr " - " -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "`\\' " -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr " - " -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "- [^ [" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "- \\( (" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "- \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} " -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr " " -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr " " -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr " " -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr " " -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr " " -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "- \\) )" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr " " @@ -261,17 +263,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "--bytes `%s' " #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "--horizon-lines `%s' " +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -422,7 +424,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr " `%s'- `%s' \n" @@ -432,7 +434,7 @@ msgstr " `%s'- `%s' \n" msgid "Binary files %s and %s differ\n" msgstr " `%s'- `%s' \n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr " - " @@ -446,14 +448,14 @@ msgstr "" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr ". `%s --help' " #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "--ignore-initial `%s' " #: src/cmp.c:147 @@ -461,14 +463,14 @@ msgstr "--ignore-initial `%s' " msgid "options -l and -s are incompatible" msgstr " -s- -l " -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr " " -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr " " @@ -529,7 +531,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr " . SKIP2- SKIP1" -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -545,26 +547,27 @@ msgstr "" " .T, P, E, Z, Y ,G 1,073,741,824 ,GB 1,000,000,000" #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr " . , `-' FILE " -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "--bytes `%s' " -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "`%s' " -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "`%s' " #: src/cmp.c:491 @@ -583,221 +586,223 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: %s \n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "`%s' " -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr " " -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr " -L " -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "`%s' " -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr " " -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "--horizon-lines `%s' " -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "`%s' Tab " -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr " Tab " -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--to-file --from-file " -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr " . --normal" -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr " . -q --brief" -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" " . -s --report-identical-files" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr ". (130 \") NUM -w NUM --width=NUM" +msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr ". (130 \") NUM -w NUM --width=NUM" -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr " . -a --text" +msgstr " .ed -e --ed" -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr " .RCS -n --rcs" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr " . -v --version" +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr ". (130 \") NUM -w NUM --width=NUM" -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr " . , -l --left-column" -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "" " . -s --suppress-common-lines" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr " . TAB -t --expand-tabs" -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr " . TAB \" -TAB -T --initial-tab" -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr " .(8 \") NUM Tab --tabsize=NUM" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr " . `pr' -l --paginate" -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr " . - -r --recursive" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr " . -N --new-file" -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " . --unidirectional-new-file" -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr ". --ignore-file-name-case" -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " . --no-ignore-file-name-case" -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr " .PAT -x PAT --exclude=PAT" -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "FILE- -X FILE --exclude-from=FILE" -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" " .FILE -S FILE --starting-file=FILE" -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -805,7 +810,7 @@ msgid "" msgstr "" ". FILE1 . FILE1 --from-file=FILE1" -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -813,95 +818,96 @@ msgid "" msgstr "" " . FILE2 .FILE2- --to-file=FILE2" -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr ". -i --ignore-case" -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" " . TAB -E --ignore-tab-expansion" -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr " . -w --ignore-all-space" -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr " . -b --ignore-space-change" -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr " . -w --ignore-all-space" -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr " . -B --ignore-blank-lines" -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" ".RE -I RE --ignore-matching-lines=RE" -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr " . -a --text" -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " . CR --strip-trailing-cr" -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr " . --binary" -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "`#ifdef NAME'- , -D NAME --ifdef=NAME" -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "GFMT GTYPE ,\" --GTYPE-group-format=GFMT" -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr " .LFMT ,\" --line-format=LFMT" -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" ".LFMT LTYPE ,\" --LTYPE-group-format=LFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr " .`changed' LTYPE GTYPE .`unchanged' `new' ,`old' LTYPE" -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -929,7 +935,7 @@ msgstr "" " F-1 E\n" " M+1 M" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -942,7 +948,7 @@ msgstr "" " %l\n" " printf %[-][WIDTH][.[PREC]]{doxX}n" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -956,94 +962,102 @@ msgstr "" " C %c'C'\n" " OOO %c'\\OOO'" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr " . -d --minimal" -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" ". NUM --horizon-lines=NUM" -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " . -H --speed-large-files" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr " . -v --version" -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" ".`FILE... DIR' `DIR FILE...' `DIR1 DIR2' `FILE1 FILE2' FILES" -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" " .FILES ,--to-file --from-file " -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "" " . ,`-' FILE " -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "%s [OPTION]... FILES : \n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr ". " -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "%s `%s' " -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr " " -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "%s- %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr " `-' " -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr " -D " -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s- %s : -\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "%s %s- %s %s \n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr " `%s'- `%s' \n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr " %s- %s \n" @@ -1060,11 +1074,12 @@ msgid "incompatible options" msgstr " " #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr " `-' " -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr " " @@ -1101,14 +1116,12 @@ msgstr "" " . -x --overlap-only" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -" . , -E --show-overlap" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr " .ed `q'- `w' -i" #: src/diff3.c:438 @@ -1145,9 +1158,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr " . -a --text" +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1198,30 +1210,30 @@ msgstr "process_diff : " msgid "invalid diff format; invalid change separator" msgstr " : " -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr " : " -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, fuzzy, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr " `%s' -" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr " : " -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr " : " -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr " " #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "`%s'- `%s' " #: src/dir.c:209 @@ -1235,130 +1247,135 @@ msgstr "" msgid "Thomas Lord" msgstr ".Thomas Lord \" " -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr " .FILE- , -o FILE --output=FILE" -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr " . -i --ignore-case" -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" " . TAB -E --ignore-tab-expansion" -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr " . -w --ignore-all-space" -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr " . -b --ignore-space-change" -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr " . -w --ignore-all-space" +msgstr " . -W --ignore-all-space" -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr " . -B --ignore-blank-lines" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +".RE -I RE --ignore-matching-lines=RE" + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " . CR --strip-trailing-cr" -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr " . -a --text" -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr ". (130 \") NUM -w NUM --width=NUM" -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr " . , -l --left-column" -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "" " . -s --suppress-common-lines" -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr " . TAB -t --expand-tabs" -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr " .(8 \") NUM Tab --tabsize=NUM" -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr " . -d --minimal" -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr " . -H --speed-large-files" -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " . PROGRAM --diff-program=PROGRAM" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr " . -a --text" +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr " . -v --version" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "%s [OPTION]... FILE1 FILE2 : \n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr ". " -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr " " -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr " " -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1383,6 +1400,22 @@ msgstr "" "v -- \n" "q -- \n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: - -- %c\n" + +#~ msgid "" +#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" +#~ "You may redistribute copies of this program\n" +#~ "under the terms of the GNU General Public License.\n" +#~ "For more information about these matters, see the files named COPYING." +#~ msgstr "" +#~ " . , \n" +#~ ".GNU General Public License \n" +#~ " .COPYING , " + +#~ msgid "Written by Torbjorn Granlund and David MacKenzie." +#~ msgstr ".David MacKenzie- Torbjorn Granlund \" " + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "" #~ " -i N1:N2\n" @@ -1391,53 +1424,33 @@ msgstr "" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr " . ; -s --quiet --silent" -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr " . -v --version" - #~ msgid "--help Output this help." #~ msgstr " . --help" -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr ". " - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ " . TAB -E --ignore-tab-expansion" +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr ".<bug-gnu-utils@gnu.org> " -#, fuzzy #~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ " . -b --ignore-space-change" - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr " . -W --ignore-all-space" - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." +#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman, and Len Tower." #~ msgstr "" -#~ " . -B --ignore-blank-lines" +#~ " ,David Hayes ,Mike Haertel ,Paul Eggert \" " +#~ "\n" +#~ " .Len Tower- ,Richard " +#~ "Stallman" -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ " . CR --strip-trailing-cr" +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr " `-%ld' `-%c %ld'- " -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr " . -a --text" +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr " `-%ld'- " -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1448,10 +1461,6 @@ msgstr "" #~ " .RE -F RE --show-function-" #~ "line=RE" -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr " .ed -e --ed" - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1463,31 +1472,11 @@ msgstr "" #~ " . , --left-column\n" #~ " . --suppress-common-lines" -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr " . TAB -t --expand-tabs" - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr " . TAB \" -TAB -T --initial-tab" - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr " .(8 \") NUM Tab --tabsize=NUM" - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr " . -d --minimal" - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ " . --speed-large-files" -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr " . , -A --show-all" - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr " . -X" @@ -1499,89 +1488,6 @@ msgstr "" #~ " . LABEL- -L LABEL --" #~ "label=LABEL" -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ " . PROGRAM --diff-" -#~ "program=PROGRAM" - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr " . -W --ignore-all-space" - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr ". (130 \") NUM -w NUM --width=NUM" - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr " . , -l --left-column" - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ " . --speed-large-files" - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr " " - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: - -- %c\n" - -#~ msgid "" -#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" -#~ "You may redistribute copies of this program\n" -#~ "under the terms of the GNU General Public License.\n" -#~ "For more information about these matters, see the files named COPYING." -#~ msgstr "" -#~ " . , \n" -#~ ".GNU General Public License \n" -#~ " .COPYING , " - -#~ msgid "Written by Torbjorn Granlund and David MacKenzie." -#~ msgstr ".David MacKenzie- Torbjorn Granlund \" " - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr ".<bug-gnu-utils@gnu.org> " - -#~ msgid "" -#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman, and Len Tower." -#~ msgstr "" -#~ " ,David Hayes ,Mike Haertel ,Paul Eggert \" " -#~ "\n" -#~ " .Len Tower- ,Richard " -#~ "Stallman" - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr " `-%ld' `-%c %ld'- " - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr " `-%ld'- " - #~ msgid "subsidiary program `%s' failed" #~ msgstr "`%s' - " diff --git a/po/hr.gmo b/po/hr.gmo Binary files differnew file mode 100644 index 0000000..f395359 --- /dev/null +++ b/po/hr.gmo diff --git a/po/hr.po b/po/hr.po new file mode 100644 index 0000000..b92cbb8 --- /dev/null +++ b/po/hr.po @@ -0,0 +1,1307 @@ +# Translation of diffutils to Croatian. +# Copyright © 2012 Free Software Foundation, Inc. +# This file is distributed under the same license as the diffutils package. +# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: GNU diffutils 3.3-pre1\n" +"Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-12-21 00:37+0100\n" +"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" +"Language-Team: Croatian <lokalizacija@linux.hr>\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Gtranslator 2.91.5\n" + +#: lib/c-stack.c:204 lib/c-stack.c:297 +msgid "program error" +msgstr "programska greška" + +#: lib/c-stack.c:205 lib/c-stack.c:298 +msgid "stack overflow" +msgstr "preljev stoga" + +#: lib/error.c:188 +msgid "Unknown system error" +msgstr "Nepoznata greška sustava" + +#: lib/file-type.c:38 +msgid "regular empty file" +msgstr "obična prazna datoteka" + +#: lib/file-type.c:38 +msgid "regular file" +msgstr "obična datoteka" + +#: lib/file-type.c:41 +msgid "directory" +msgstr "direktorij" + +#: lib/file-type.c:44 +msgid "block special file" +msgstr "posebna blokovska datoteka" + +#: lib/file-type.c:47 +msgid "character special file" +msgstr "posebna znakovna datoteka" + +#: lib/file-type.c:50 +msgid "fifo" +msgstr "fifo" + +#: lib/file-type.c:53 +msgid "symbolic link" +msgstr "simbolička veza" + +#: lib/file-type.c:56 +msgid "socket" +msgstr "utičnica" + +#: lib/file-type.c:59 +msgid "message queue" +msgstr "red poruka" + +#: lib/file-type.c:62 +msgid "semaphore" +msgstr "semafor" + +#: lib/file-type.c:65 +msgid "shared memory object" +msgstr "dijeljeni memorijski objekt" + +#: lib/file-type.c:68 +msgid "typed memory object" +msgstr "tipizirani memorijski objekt" + +#: lib/file-type.c:70 +msgid "weird file" +msgstr "čudna datoteka" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: opcija „%s” je višeznačna, mogućnosti:" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: opcija „--%s” ne dozvoljava argument\n" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: opcija „--%s” zahtijeva argument\n" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: neprepoznata opcija „--%s”\n" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: neprepoznata opcija „%c%s”\n" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: neispravna opcija -- „%c”\n" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: opcija zahtijeva argument -- „%c”\n" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: opcija „-W %s” je višeznačna\n" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: opcija „-W %s” zahtijeva argument\n" + +#. TRANSLATORS: +#. Get translations for open and closing quotation marks. +#. The message catalog should translate "`" to a left +#. quotation mark suitable for the locale, and similarly for +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. +#. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. +#. +#. If you don't know what to put here, please see +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> +#. and use glyphs suitable for your language. +#: lib/quotearg.c:312 +msgid "`" +msgstr "„" + +#: lib/quotearg.c:313 +msgid "'" +msgstr "”" + +#: lib/regcomp.c:131 +msgid "Success" +msgstr "Uspjeh" + +#: lib/regcomp.c:134 +msgid "No match" +msgstr "Nema poklapanja" + +#: lib/regcomp.c:137 +msgid "Invalid regular expression" +msgstr "Neispravan regularni izraz" + +#: lib/regcomp.c:140 +msgid "Invalid collation character" +msgstr "Neispravan znak razvrstavanja" + +#: lib/regcomp.c:143 +msgid "Invalid character class name" +msgstr "Neispravno ime razreda znakova" + +#: lib/regcomp.c:146 +msgid "Trailing backslash" +msgstr "Obrnuta kosa crta na kraju" + +#: lib/regcomp.c:149 +msgid "Invalid back reference" +msgstr "Neispravna povratna referenca" + +#: lib/regcomp.c:152 +msgid "Unmatched [ or [^" +msgstr "Neuparena [ ili [^" + +#: lib/regcomp.c:155 +msgid "Unmatched ( or \\(" +msgstr "Neuparena ( ili \\(" + +#: lib/regcomp.c:158 +msgid "Unmatched \\{" +msgstr "Neuparena \\{" + +#: lib/regcomp.c:161 +msgid "Invalid content of \\{\\}" +msgstr "Neispravan sadržaj \\{\\}" + +#: lib/regcomp.c:164 +msgid "Invalid range end" +msgstr "Neispravan kraj raspona" + +#: lib/regcomp.c:167 +msgid "Memory exhausted" +msgstr "Memorija iscrpljena" + +#: lib/regcomp.c:170 +msgid "Invalid preceding regular expression" +msgstr "Neispravan prethodni regularni izraz" + +#: lib/regcomp.c:173 +msgid "Premature end of regular expression" +msgstr "Preuranjen kraj regularnog izraza" + +#: lib/regcomp.c:176 +msgid "Regular expression too big" +msgstr "Regularni izraz je prevelik" + +#: lib/regcomp.c:179 +msgid "Unmatched ) or \\)" +msgstr "Neuparena ) ili \\)" + +#: lib/regcomp.c:704 +msgid "No previous regular expression" +msgstr "Nedostaje prethodni regularni izraz" + +#: lib/xalloc-die.c:34 +msgid "memory exhausted" +msgstr "memorija iscrpljena" + +#: lib/xfreopen.c:35 +msgid "stdin" +msgstr "standardni ulaz" + +#: lib/xfreopen.c:36 +msgid "stdout" +msgstr "standardni izlaz" + +#: lib/xfreopen.c:37 +msgid "stderr" +msgstr "standardni izlaz za greške" + +#: lib/xfreopen.c:38 +msgid "unknown stream" +msgstr "nepoznat tok podataka" + +#: lib/xfreopen.c:39 +#, c-format +msgid "failed to reopen %s with mode %s" +msgstr "nisam uspio ponovo otvoriti %s s modom %s" + +#: lib/xstrtol-error.c:63 +#, c-format +msgid "invalid %s%s argument '%s'" +msgstr "neispravan %s%s argument „%s”" + +#: lib/xstrtol-error.c:68 +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "neispravan sufiks u %s%s argumentu „%s”" + +#: lib/xstrtol-error.c:72 +#, c-format +msgid "%s%s argument '%s' too large" +msgstr "%s%s argument „%s” je prevelik" + +#: lib/version-etc.c:74 +#, c-format +msgid "Packaged by %s (%s)\n" +msgstr "Pakirao %s (%s)\n" + +#: lib/version-etc.c:77 +#, c-format +msgid "Packaged by %s\n" +msgstr "Pakirao %s\n" + +#. TRANSLATORS: Translate "(C)" to the copyright symbol +#. (C-in-a-circle), if this symbol is available in the user's +#. locale. Otherwise, do not translate "(C)"; leave it as-is. +#: lib/version-etc.c:84 +msgid "(C)" +msgstr "©" + +#: lib/version-etc.c:86 +msgid "" +"\n" +"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl." +"html>.\n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +"\n" +msgstr "" +"\n" +"Licenca GPLv3+: GNU GPL inačica 3 ili novija <http://gnu.org/licenses/gpl." +"html>.\n" +"Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n" +"NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n" +"\n" + +#. TRANSLATORS: %s denotes an author name. +#: lib/version-etc.c:102 +#, c-format +msgid "Written by %s.\n" +msgstr "Napisao %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:106 +#, c-format +msgid "Written by %s and %s.\n" +msgstr "Napisali %s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: lib/version-etc.c:110 +#, c-format +msgid "Written by %s, %s, and %s.\n" +msgstr "Napisali %s, %s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:117 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"and %s.\n" +msgstr "" +"Napisali %s, %s, %s\n" +"i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:124 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:131 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:139 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:147 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s, %s\n" +"i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:156 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, and %s.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s i %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#. You can use line breaks, estimating that each author name occupies +#. ca. 16 screen columns and that a screen line has ca. 80 columns. +#: lib/version-etc.c:167 +#, c-format +msgid "" +"Written by %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, and others.\n" +msgstr "" +"Napisali %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s i ostali.\n" + +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:245 +#, c-format +msgid "" +"\n" +"Report bugs to: %s\n" +msgstr "" +"\n" +"Prijavite greške na %s.\n" +"Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n" + +#: lib/version-etc.c:247 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "Prijavite %s greške na %s\n" + +#: lib/version-etc.c:251 +#, c-format +msgid "%s home page: <%s>\n" +msgstr "%s početna stranica: <%s>\n" + +#: lib/version-etc.c:253 +#, c-format +msgid "%s home page: <http://www.gnu.org/software/%s/>\n" +msgstr "%s početna stranica: <http://www.gnu.org/software/%s/>\n" + +#: lib/version-etc.c:256 +msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" +msgstr "" +"Općenita pomoć za korištenje GNU softvera: <http://www.gnu.org/gethelp/>\n" + +#: src/analyze.c:459 src/diff.c:1343 +#, c-format +msgid "Files %s and %s differ\n" +msgstr "Datoteke %s i %s se razlikuju\n" + +#: src/analyze.c:462 +#, c-format +msgid "Binary files %s and %s differ\n" +msgstr "Binarne datoteke %s i %s se razlikuju\n" + +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 +msgid "No newline at end of file" +msgstr "Nema novog retka na kraju datoteke" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cmp.c:43 +msgid "Torbjorn Granlund" +msgstr "Torbjorn Granlund" + +#. This is a proper name. See the gettext manual, section Names. +#: src/cmp.c:44 +msgid "David MacKenzie" +msgstr "David MacKenzie" + +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, c-format +msgid "Try '%s --help' for more information." +msgstr "Pokušajte „%s --help” za više informacija." + +#: src/cmp.c:137 +#, c-format +msgid "invalid --ignore-initial value '%s'" +msgstr "neispravna --ignore-initial vrijednost „%s”" + +#: src/cmp.c:147 +#, c-format +msgid "options -l and -s are incompatible" +msgstr "opcije -l i -s nisu kompatibilne" + +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 +msgid "write failed" +msgstr "pisanje nije uspjelo" + +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 +msgid "standard output" +msgstr "standardni izlaz" + +#: src/cmp.c:161 +msgid "-b, --print-bytes print differing bytes" +msgstr "-b, --print-bytes ispiši bajtove koji se razlikuju" + +#: src/cmp.c:162 +msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" +msgstr "" +"-i, --ignore-initial=BROJ preskoči prvih BROJ bajtova oba ulaza" + +#: src/cmp.c:163 +msgid "" +"-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" +" first SKIP2 bytes of FILE2" +msgstr "" +"-i, --ignore-initial=BROJ1:BROJ2 preskoči prvih BROJ1 bajtova DATOTEKE1\n" +" i prvih BROJ2 bajtova DATOTEKE2" + +#: src/cmp.c:165 +msgid "" +"-l, --verbose output byte numbers and differing byte values" +msgstr "" +"-l, --verbose ispiši brojeve i vrijednosti bajtova koji se " +"razlikuju" + +#: src/cmp.c:166 +msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" +msgstr "-n, --bytes=BROJ usporedi najviše BROJ bajtova" + +#: src/cmp.c:167 +msgid "-s, --quiet, --silent suppress all normal output" +msgstr "-s, --quiet, --silent izostavi sav normalan izlaz" + +#: src/cmp.c:168 +msgid " --help display this help and exit" +msgstr " --help prikaži ovu pomoć i izađi" + +#: src/cmp.c:169 +msgid "-v, --version output version information and exit" +msgstr "-v, --version ispiši informacije o inačici i izađi" + +#: src/cmp.c:178 +#, c-format +msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" +msgstr "Uporaba: %s [OPCIJA]... DATOTEKA1 [DATOTEKA2 [BROJ1 [BROJ2]]]\n" + +#: src/cmp.c:180 +msgid "Compare two files byte by byte." +msgstr "Usporedi dvije datoteke bajt po bajt." + +#: src/cmp.c:182 +msgid "" +"The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" +"at the beginning of each file (zero by default)." +msgstr "" + +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 +msgid "" +"Mandatory arguments to long options are mandatory for short options too.\n" +msgstr "" +"Obavezni argumenti dugačkih opcija također su obavezni i za kratke opcije.\n" + +#: src/cmp.c:191 +msgid "" +"SKIP values may be followed by the following multiplicative suffixes:\n" +"kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" +"GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." +msgstr "" + +#: src/cmp.c:194 +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Ako DATOTEKA nije navedena ili je „-”, čitaj standardni ulaz." + +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 +msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." +msgstr "" +"Izlazno stanje je 0 ako su ulazi jednaki, 1 ako se razlikuju, 2 u slučaju " +"greške." + +#: src/cmp.c:240 +#, c-format +msgid "invalid --bytes value '%s'" +msgstr "neispravna --bytes vrijednost „%s”" + +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, c-format +msgid "missing operand after '%s'" +msgstr "nedostaje operand nakon „%s”" + +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, c-format +msgid "extra operand '%s'" +msgstr "operand viška „%s”" + +#: src/cmp.c:491 +#, c-format +msgid "%s %s differ: byte %s, line %s\n" +msgstr "" + +#: src/cmp.c:507 +#, c-format +msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" +msgstr "" + +#: src/cmp.c:559 +#, c-format +msgid "cmp: EOF on %s\n" +msgstr "" + +#. This is a proper name. See the gettext manual, section Names. +#: src/diff.c:49 +msgid "Paul Eggert" +msgstr "Paul Eggert" + +#. This is a proper name. See the gettext manual, section Names. +#: src/diff.c:50 +msgid "Mike Haertel" +msgstr "Mike Haertel" + +#. This is a proper name. See the gettext manual, section Names. +#: src/diff.c:51 +msgid "David Hayes" +msgstr "David Hayes" + +#. This is a proper name. See the gettext manual, section Names. +#: src/diff.c:52 +msgid "Richard Stallman" +msgstr "Richard Stallman" + +#. This is a proper name. See the gettext manual, section Names. +#: src/diff.c:53 +msgid "Len Tower" +msgstr "Len Tower" + +#: src/diff.c:339 +#, c-format +msgid "invalid context length '%s'" +msgstr "neispravna duljina sadržaja „%s”" + +#: src/diff.c:422 +#, c-format +msgid "pagination not supported on this host" +msgstr "straničenje nije podržano na ovom računalu" + +#: src/diff.c:437 src/diff3.c:300 +#, c-format +msgid "too many file label options" +msgstr "previše opcija oznaka datoteka" + +#: src/diff.c:514 +#, c-format +msgid "invalid width '%s'" +msgstr "neispravna širina „%s”" + +#: src/diff.c:518 +msgid "conflicting width options" +msgstr "konfliktne opcije širine" + +#: src/diff.c:543 +#, c-format +msgid "invalid horizon length '%s'" +msgstr "neispravna duljina sadržaja „%s”" + +#: src/diff.c:598 +#, c-format +msgid "invalid tabsize '%s'" +msgstr "neispravna širina „%s”" + +#: src/diff.c:602 +msgid "conflicting tabsize options" +msgstr "konfliktne opcije širine" + +#: src/diff.c:734 +msgid "--from-file and --to-file both specified" +msgstr "" + +#: src/diff.c:854 +msgid " --normal output a normal diff (the default)" +msgstr " --normal ispiši normalnu razliku (zadano)" + +#: src/diff.c:855 +msgid "-q, --brief report only when files differ" +msgstr "-q, --brief izvještaj samo kad se datoteke razlikuju" + +#: src/diff.c:856 +msgid "-s, --report-identical-files report when two files are the same" +msgstr "-s, --report-identical-files izvještaj samo kad su datoteke jednake" + +#: src/diff.c:857 +msgid "" +"-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" +msgstr "" + +#: src/diff.c:858 +msgid "" +"-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" +msgstr "" + +#: src/diff.c:859 +msgid "-e, --ed output an ed script" +msgstr "-e, --ed ispiši ed skriptu" + +#: src/diff.c:860 +msgid "-n, --rcs output an RCS format diff" +msgstr "-n, --rcs ispiši razliku u RCS obliku" + +#: src/diff.c:861 +msgid "-y, --side-by-side output in two columns" +msgstr "-y, --side-by-side ispiši u dva stupca" + +#: src/diff.c:862 +msgid "" +"-W, --width=NUM output at most NUM (default 130) print columns" +msgstr "" + +#: src/diff.c:863 +msgid "" +" --left-column output only the left column of common lines" +msgstr "" + +#: src/diff.c:864 +msgid " --suppress-common-lines do not output common lines" +msgstr "" + +#: src/diff.c:866 +msgid "-p, --show-c-function show which C function each change is in" +msgstr "" + +#: src/diff.c:867 +msgid "-F, --show-function-line=RE show the most recent line matching RE" +msgstr "" + +#: src/diff.c:868 +msgid "" +" --label LABEL use LABEL instead of file name\n" +" (can be repeated)" +msgstr "" + +#: src/diff.c:871 +msgid "-t, --expand-tabs expand tabs to spaces in output" +msgstr "-t, --expand-tabs pretvori tabulatore u praznine u izlazu" + +#: src/diff.c:872 +msgid "-T, --initial-tab make tabs line up by prepending a tab" +msgstr "" + +#: src/diff.c:873 +msgid "" +" --tabsize=NUM tab stops every NUM (default 8) print columns" +msgstr "" + +#: src/diff.c:874 +msgid "" +" --suppress-blank-empty suppress space or tab before empty output lines" +msgstr "" + +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "" + +#: src/diff.c:877 +msgid "" +"-r, --recursive recursively compare any subdirectories found" +msgstr "" + +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference ne slijedi simboličke veze" + +#: src/diff.c:879 +msgid "-N, --new-file treat absent files as empty" +msgstr "" +"-N, --new-file postupaj s odsutnim datotekama kao s praznim" + +#: src/diff.c:880 +msgid " --unidirectional-new-file treat absent first files as empty" +msgstr "" + +#: src/diff.c:881 +msgid " --ignore-file-name-case ignore case when comparing file names" +msgstr "" +" --ignore-file-name-case zanemari veličinu slova pri uspoređivanju " +"imena datoteka" + +#: src/diff.c:882 +msgid " --no-ignore-file-name-case consider case when comparing file names" +msgstr "" +" --no-ignore-file-name-case ne zanemaruj veličinu slova pri " +"uspoređivanju imena datoteka" + +#: src/diff.c:883 +msgid "-x, --exclude=PAT exclude files that match PAT" +msgstr "" + +#: src/diff.c:884 +msgid "" +"-X, --exclude-from=FILE exclude files that match any pattern in FILE" +msgstr "" + +#: src/diff.c:885 +msgid "" +"-S, --starting-file=FILE start with FILE when comparing directories" +msgstr "" + +#: src/diff.c:886 +msgid "" +" --from-file=FILE1 compare FILE1 to all operands;\n" +" FILE1 can be a directory" +msgstr "" + +#: src/diff.c:888 +msgid "" +" --to-file=FILE2 compare all operands to FILE2;\n" +" FILE2 can be a directory" +msgstr "" + +#: src/diff.c:891 +msgid "" +"-i, --ignore-case ignore case differences in file contents" +msgstr "" + +#: src/diff.c:892 +msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" +msgstr "" + +#: src/diff.c:893 +msgid "-Z, --ignore-trailing-space ignore white space at line end" +msgstr "" + +#: src/diff.c:894 +msgid "" +"-b, --ignore-space-change ignore changes in the amount of white space" +msgstr "" + +#: src/diff.c:895 +msgid "-w, --ignore-all-space ignore all white space" +msgstr "" + +#: src/diff.c:896 +msgid "" +"-B, --ignore-blank-lines ignore changes where lines are all blank" +msgstr "" + +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" +msgstr "" + +#: src/diff.c:899 +msgid "-a, --text treat all files as text" +msgstr "" +"-a, --text postupaj sa svim datotekama kao s tekstualnim" + +#: src/diff.c:900 +msgid " --strip-trailing-cr strip trailing carriage return on input" +msgstr "" + +#: src/diff.c:902 +msgid " --binary read and write data in binary mode" +msgstr " --binary čitaj i piši podatke u binarnom načinu" + +#: src/diff.c:905 +msgid "" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" +msgstr "" + +#: src/diff.c:906 +msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" +msgstr "" + +#: src/diff.c:907 +msgid " --line-format=LFMT format all input lines with LFMT" +msgstr "" + +#: src/diff.c:908 +msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" +msgstr "" + +#: src/diff.c:909 +msgid "" +" These format options provide fine-grained control over the output\n" +" of diff, generalizing -D/--ifdef." +msgstr "" + +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." +msgstr "" + +#: src/diff.c:912 +msgid "" +" GFMT (only) may contain:\n" +" %< lines from FILE1\n" +" %> lines from FILE2\n" +" %= lines common to FILE1 and FILE2\n" +" %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n" +" LETTERs are as follows for new group, lower case for old group:\n" +" F first line number\n" +" L last line number\n" +" N number of lines = L-F+1\n" +" E F-1\n" +" M L+1\n" +" %(A=B?T:E) if A equals B then T else E" +msgstr "" + +#: src/diff.c:924 +msgid "" +" LFMT (only) may contain:\n" +" %L contents of line\n" +" %l contents of line, excluding any trailing newline\n" +" %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" +msgstr "" + +#: src/diff.c:928 +msgid "" +" Both GFMT and LFMT may contain:\n" +" %% %\n" +" %c'C' the single character C\n" +" %c'\\OOO' the character with octal code OOO\n" +" C the character C (other characters represent themselves)" +msgstr "" + +#: src/diff.c:934 +msgid "-d, --minimal try hard to find a smaller set of changes" +msgstr "" + +#: src/diff.c:935 +msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" +msgstr "" + +#: src/diff.c:936 +msgid "" +" --speed-large-files assume large files and many scattered small changes" +msgstr "" + +#: src/diff.c:938 +msgid " --help display this help and exit" +msgstr " --help prikaži ovu pomoć i izađi" + +#: src/diff.c:939 +msgid "-v, --version output version information and exit" +msgstr "-v, --version ispiši informacije o inačici i izađi" + +#: src/diff.c:941 +msgid "" +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." +msgstr "" +"DATOTEKE su „DATOTEKA1 DATOTEKA2”, „DIR1 DIR2”, „DIR DATOTEKA...” ili " +"„DATOTEKA... DIR”." + +#: src/diff.c:942 +msgid "" +"If --from-file or --to-file is given, there are no restrictions on FILE(s)." +msgstr "" + +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Ako je DATOTEKA „-”, čitaj standardni ulaz." + +#: src/diff.c:953 +#, c-format +msgid "Usage: %s [OPTION]... FILES\n" +msgstr "Uporaba: %s [OPCIJA]... DATOTEKE\n" + +#: src/diff.c:954 +msgid "Compare FILES line by line." +msgstr "Usporedi DATOTEKE redak po redak." + +# Ovdje trebam zamijeniti poredak... Pogledati kako se to radi. +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" +msgstr "konfliktna vrijednost „%s” opcije „%s”" + +# Notes: +# Add Note +# +# Format: +# C +#: src/diff.c:1001 +#, c-format +msgid "conflicting output style options" +msgstr "konfliktne opcije izlaznog stila" + +#: src/diff.c:1058 src/diff.c:1268 +#, c-format +msgid "Only in %s: %s\n" +msgstr "Samo u %s: %s\n" + +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "ne mogu usporediti „-” s direktorijem" + +#: src/diff.c:1227 +msgid "-D option not supported with directories" +msgstr "opcija -D nije podržana s direktorijima" + +#: src/diff.c:1236 +#, c-format +msgid "Common subdirectories: %s and %s\n" +msgstr "Uobičajeni poddirektoriji: %s i %s\n" + +#: src/diff.c:1278 src/diff.c:1328 +#, c-format +msgid "File %s is a %s while file %s is a %s\n" +msgstr "Datoteka %s je %s, a datoteka %s je %s\n" + +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Simboličke veze %s i %s se razlikuju\n" + +#: src/diff.c:1399 +#, c-format +msgid "Files %s and %s are identical\n" +msgstr "Datoteke %s i %s su identične\n" + +#. This is a proper name. See the gettext manual, section Names. +#: src/diff3.c:41 +msgid "Randy Smith" +msgstr "Randy Smith" + +#: src/diff3.c:313 +#, c-format +msgid "incompatible options" +msgstr "nekompatibilne opcije" + +#: src/diff3.c:353 +msgid "'-' specified for more than one input file" +msgstr "„-” je navedeno za više od jedne ulazne datoteke" + +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 +msgid "read failed" +msgstr "čitanje nije uspjelo" + +#: src/diff3.c:428 +msgid "-A, --show-all output all changes, bracketing conflicts" +msgstr "" + +#: src/diff3.c:430 +msgid "" +"-e, --ed output ed script incorporating changes\n" +" from OLDFILE to YOURFILE into MYFILE" +msgstr "" + +#: src/diff3.c:432 +msgid "-E, --show-overlap like -e, but bracket conflicts" +msgstr "" + +#: src/diff3.c:433 +msgid "" +"-3, --easy-only like -e, but incorporate only nonoverlapping " +"changes" +msgstr "" + +#: src/diff3.c:434 +msgid "" +"-x, --overlap-only like -e, but incorporate only overlapping changes" +msgstr "" + +#: src/diff3.c:435 +msgid "-X like -x, but bracket conflicts" +msgstr "" + +#: src/diff3.c:436 +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "" + +#: src/diff3.c:438 +msgid "" +"-m, --merge output actual merged file, according to\n" +" -A if no other options are given" +msgstr "" + +#: src/diff3.c:441 +msgid "-a, --text treat all files as text" +msgstr "" +"-a, --text postupaj sa svim datotekama kao s tekstualnim" + +#: src/diff3.c:442 +msgid " --strip-trailing-cr strip trailing carriage return on input" +msgstr "" + +#: src/diff3.c:443 +msgid "-T, --initial-tab make tabs line up by prepending a tab" +msgstr "" + +#: src/diff3.c:444 +msgid " --diff-program=PROGRAM use PROGRAM to compare files" +msgstr "" + +#: src/diff3.c:445 +msgid "" +"-L, --label=LABEL use LABEL instead of file name\n" +" (can be repeated up to three times)" +msgstr "" + +#: src/diff3.c:448 +msgid " --help display this help and exit" +msgstr " --help prikaži ovu pomoć i izađi" + +#: src/diff3.c:449 +msgid "-v, --version output version information and exit" +msgstr "-v, --version ispiši informacije o inačici i izađi" + +#: src/diff3.c:458 +#, c-format +msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" +msgstr "" + +#: src/diff3.c:460 +msgid "Compare three files line by line." +msgstr "Usporedi tri datoteke redak po redak." + +#: src/diff3.c:470 +msgid "" +"\n" +"The default output format is a somewhat human-readable representation of\n" +"the changes.\n" +"\n" +"The -e, -E, -x, -X (and corresponding long) options cause an ed script\n" +"to be output instead of the default.\n" +"\n" +"Finally, the -m (--merge) option causes diff3 to do the merge internally\n" +"and output the actual merged file. For unusual input, this is more\n" +"robust than using ed.\n" +msgstr "" + +#: src/diff3.c:482 +msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." +msgstr "Izlazno stanje je 0 za uspjeh, 1 za neuspjeh, 2 u slučaju greške." + +#: src/diff3.c:675 +msgid "internal error: screwup in format of diff blocks" +msgstr "" + +#: src/diff3.c:968 +#, c-format +msgid "%s: diff failed: " +msgstr "%s: diff nije uspio: " + +#: src/diff3.c:990 +msgid "internal error: invalid diff type in process_diff" +msgstr "interna greška: neispravna diff vrsta u process_diff" + +#: src/diff3.c:1015 +msgid "invalid diff format; invalid change separator" +msgstr "" + +#: src/diff3.c:1251 +msgid "invalid diff format; incomplete last line" +msgstr "neispravan diff oblik, nepotpun posljednji redak" + +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, c-format +msgid "subsidiary program '%s' could not be invoked" +msgstr "podređeni program „%s” se ne može pozvati" + +#: src/diff3.c:1300 +msgid "invalid diff format; incorrect leading line chars" +msgstr "" + +#: src/diff3.c:1373 +msgid "internal error: invalid diff type passed to output" +msgstr "" + +#: src/diff3.c:1647 src/diff3.c:1704 +msgid "input file shrank" +msgstr "ulazna datoteka se smanjila" + +#: src/dir.c:158 +#, c-format +msgid "cannot compare file names '%s' and '%s'" +msgstr "ne mogu usporediti imena datoteka „%s” i „%s”" + +#: src/dir.c:209 +#, c-format +msgid "%s: recursive directory loop" +msgstr "%s: rekurzivna petlja direktorija" + +#. This is a proper name. See the gettext manual, section Names. +#: src/sdiff.c:42 +msgid "Thomas Lord" +msgstr "Thomas Lord" + +#: src/sdiff.c:173 +msgid "" +"-o, --output=FILE operate interactively, sending output to FILE" +msgstr "" + +#: src/sdiff.c:175 +msgid "" +"-i, --ignore-case consider upper- and lower-case to be the same" +msgstr "" + +#: src/sdiff.c:176 +msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" +msgstr "" + +#: src/sdiff.c:177 +msgid "-Z, --ignore-trailing-space ignore white space at line end" +msgstr "" + +#: src/sdiff.c:178 +msgid "" +"-b, --ignore-space-change ignore changes in the amount of white space" +msgstr "" + +#: src/sdiff.c:179 +msgid "-W, --ignore-all-space ignore all white space" +msgstr "" + +#: src/sdiff.c:180 +msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" +msgstr "" + +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" + +#: src/sdiff.c:182 +msgid " --strip-trailing-cr strip trailing carriage return on input" +msgstr "" + +#: src/sdiff.c:183 +msgid "-a, --text treat all files as text" +msgstr "" +"-a, --text postupaj sa svim datotekama kao s tekstualnim" + +#: src/sdiff.c:185 +msgid "" +"-w, --width=NUM output at most NUM (default 130) print columns" +msgstr "" + +#: src/sdiff.c:186 +msgid "" +"-l, --left-column output only the left column of common lines" +msgstr "" + +#: src/sdiff.c:187 +msgid "-s, --suppress-common-lines do not output common lines" +msgstr "" + +#: src/sdiff.c:189 +msgid "-t, --expand-tabs expand tabs to spaces in output" +msgstr "-t, --expand-tabs pretvori tabulatore u praznine u izlazu" + +#: src/sdiff.c:190 +msgid "" +" --tabsize=NUM tab stops at every NUM (default 8) print columns" +msgstr "" + +#: src/sdiff.c:192 +msgid "-d, --minimal try hard to find a smaller set of changes" +msgstr "" + +#: src/sdiff.c:193 +msgid "" +"-H, --speed-large-files assume large files, many scattered small changes" +msgstr "" + +#: src/sdiff.c:194 +msgid " --diff-program=PROGRAM use PROGRAM to compare files" +msgstr "" + +#: src/sdiff.c:196 +msgid " --help display this help and exit" +msgstr " --help prikaži ovu pomoć i izađi" + +#: src/sdiff.c:197 +msgid "-v, --version output version information and exit" +msgstr "-v, --version ispiši informacije o inačici i izađi" + +#: src/sdiff.c:206 +#, c-format +msgid "Usage: %s [OPTION]... FILE1 FILE2\n" +msgstr "Uporaba: %s [OPCIJA]... DATOTEKA1 DATOTEKA2\n" + +#: src/sdiff.c:208 +msgid "Side-by-side merge of differences between FILE1 and FILE2." +msgstr "" + +#: src/sdiff.c:329 +msgid "cannot interactively merge standard input" +msgstr "ne mogu interaktivno spojiti standardni ulaz" + +#: src/sdiff.c:595 +msgid "both files to be compared are directories" +msgstr "obje datoteke za usporedbu su direktoriji" + +#: src/sdiff.c:818 +msgid "" +"ed:\tEdit then use both versions, each decorated with a header.\n" +"eb:\tEdit then use both versions.\n" +"el or e1:\tEdit then use the left version.\n" +"er or e2:\tEdit then use the right version.\n" +"e:\tDiscard both versions then edit a new one.\n" +"l or 1:\tUse the left version.\n" +"r or 2:\tUse the right version.\n" +"s:\tSilently include common lines.\n" +"v:\tVerbosely include common lines.\n" +"q:\tQuit.\n" +msgstr "" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-07-04 11:22+0100\n" "Last-Translator: Andras Timar <timar@fsf.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -25,7 +25,7 @@ msgstr "programhiba" msgid "stack overflow" msgstr "veremtlcsorduls" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" @@ -138,100 +138,102 @@ msgstr "%s: a `%s' kapcsolhoz argumentum szksges\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sikerlt" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nincs tallat" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "rvnytelen regulris kifejezs" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "rvnytelen collation karakter" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "rvnytelen karakterosztlynv" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Zr backslash" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "rvnytelen visszahivatkozs" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Pr nlkli [ vagy [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Pr nlkli ( vagy \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Pr nlkli \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "rvnytelen tartalom a \\{\\}-ben" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "rvnytelen tartomnyvg" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Elfogyott a memria" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "rvnytelen volt az elz regulris kifejezs" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "A regulris kifejezs tl hamar rt vget" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Tl nagy regulris kifejezs" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Pr nlkli ) vagy \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nincs elz regulris kifejezs" @@ -263,17 +265,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "rvnytelen --bytes rtk `%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "rvnytelen munkaszinthossz `%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -441,7 +443,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "A(z) %s s a(z) %s fjlok klnbznek\n" @@ -451,7 +453,7 @@ msgstr "A(z) %s s a(z) %s fjlok klnbznek\n" msgid "Binary files %s and %s differ\n" msgstr "A(z) %s s a(z) %s fjlok klnbznek\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Nincs jsor a fjl vgn" @@ -465,14 +467,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Prblja a `%s --help' kapcsolt tovbbi informcirt." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "rvnytelen --ignore-initial rtk: `%s'" #: src/cmp.c:147 @@ -480,14 +482,14 @@ msgstr "rvnytelen --ignore-initial rtk: `%s'" msgid "options -l and -s are incompatible" msgstr "a -l s a -s kapcsolk sszefrhetetlenek" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "az rs sikertelen" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "szabvnyos kimenet" @@ -549,7 +551,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "UGRS1 s UGRS2 byte-ot lp t az egyes fjlokban." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -565,28 +567,29 @@ msgstr "" "GB 1 000 000 000, G 1 073 741 824, s gy tovbb: T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Ha a FJL a `-' vagy hinyzik, akkor a szabvnyos bemenetet hasznlja." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "A kilpsi llapotkd 0, ha a bemenetek azonosak; 1, ha klnbzk; 2, ha " "hiba trtnt." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "rvnytelen --bytes rtk `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "hinyz operandus a `%s' utn" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "felesleges operandus `%s'" #: src/cmp.c:491 @@ -605,212 +608,214 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF %s-nl\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "rvnytelen krnyezethossz `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "a trdels nem tmogatott ezen a gpen" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "tl sok fjlcmke-bellts" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "rvnytelen szlessg `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "sszefrhetlen szlessgbelltsok" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "rvnytelen munkaszinthossz `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "rvnytelen tabultormret `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "sszefrhetlen tabultormret-belltsok" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "a --from-file s a --to-file is meg van adva" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal A kimenet egy norml diff." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Csak akkor van kimenet, ha a fjlok eltrnek." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Jelenti, ha a kt fjl azonos." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr "-w SZM --width=SZM Legfeljebb SZM szles kimenet (alapbl 130)." +msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w SZM --width=SZM Legfeljebb SZM szles kimenet (alapbl 130)." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Az sszes fjlt szvegknt kezeli" +msgstr "-e --ed A kimenet egy ed-parancsfjl." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs A kimenet RCS formtum diff." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version A kimenet a verziszm." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w SZM --width=SZM Legfeljebb SZM szles kimenet (alapbl 130)." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column A kzs sorokat csak bal oldra rja ki." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nem rja ki a kzs sorokat." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs A tabultorokat szkzzel helyettesti a kimenetben." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab A tabultorok helyesen jelennek meg a kezd tabultornak " "ksznheten." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" "--tabsize=NUM Tabultorpozci minden NUM. nyomtatsi oszlopban (alapbl 8)." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate A kimenet oldalainak a lapokra trdelse a`pr' programmal." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Az sszes alknyvtrat megvizsglja." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file A hinyz fjlokat resknt kezeli." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file A hinyz els fjlokat resknt kezeli." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Fjlneveknl nem tesz klnbsget\n" " a kis- s nagybetk kzt." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Fjlneveknl figyeli a kis- s nagybetk\n" " kzti klnbsget" -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x MINTA --exclude=MINTA Kihagyja a MINT-ra illeszked fjlokat." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -818,7 +823,7 @@ msgstr "" "-X FJL --exclude-from=FJL Kihagyja a FJL-ban megtallhat mintkra\n" " illeszked fjlokat." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -826,7 +831,7 @@ msgstr "" "-S FJL --starting-file=FJL A FJL-lal kezdi a knyvtrak " "sszehasoltst." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -835,7 +840,7 @@ msgstr "" "--from-file=FJL1 FJL1 sszehasonltsa minden operandussal.\n" " FJL1 lehet knyvtr is." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -844,103 +849,104 @@ msgstr "" "--to-file=FJL2 Minden operandus sszehasonltsa FJL2-vel.\n" " FJL2 lehet knyvtr." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Nem tesz klnbsget a kis- s nagybetk kztt." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Nem figyeli a tab/szkz csert." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Nem figyel semmilyen res helyet." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Nem figyeli az res helyek vltoztatst." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Nem figyel semmilyen res helyet." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Figyelmen kvl hagyja az res sorokat." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RK --ignore-matching-lines=RK Nem figyeli a RK-re illeszked sorokat." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Az sszes fjlt szvegknt kezeli" -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr A bemenetbl elhagyja a befejez kocsivissza " "karaktereket." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Olvass s rs binris mdban." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NV--ifdef=NV Kirja az sszefslt fjlt `#ifdef NV' direktvkkal " "jellve a klnbsgeket." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Hasonl, de a GTYPE bemeneti csoportokat formzza " "a GFMT formtumra." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT Hasonl, de minden bemeneti sort a LFMT formtumra " "formz." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Hasonl, de az LTYPE tpus bemeneti sorokat LFMT " "formtumra formzza." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " az LTYPE `old', `new', vagy `unchanged'. a GTYPE LTYPE vagy `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -968,7 +974,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -982,7 +988,7 @@ msgstr "" " %[-][WIDTH][.[PREC]]{doxX}n bemeneti sorok szmnak printf-stlus " "megadsa" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -996,18 +1002,18 @@ msgstr "" " %c'C' egyetlen C karakter\n" " %c'\\OOO' karakter nyolcas szmrendszer beli rtke" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Megprbl kevesebb klnbsget tallni." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=SZM SZM szm sort tart meg a kzs el s uttagbl." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1015,23 +1021,24 @@ msgstr "" "-H --speed-large-files Nagy fjlokat felttelez sok, elszrt, kis " "vltozssal." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version A kimenet a verziszm." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "A FJLOK lehetnek `FJL1 FJL2' vagy `KNYVTR1 KNYVTR2' vagy\n" "`KNYVTR FJL...' vagy `FJL... KNYVTR'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." @@ -1039,54 +1046,61 @@ msgstr "" "Ha --from-file vagy --to-file meg van adva, nincsenek megszortsok a FJLOK-" "ra." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Ha a FJL `-', a szabvnyos bemenetrl olvas." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Hasznlat: %s [KAPCSOLK]... FJLOK\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Fjlok sszehasonltsa sorrl sorra." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "sszefrhetetlen %s kapcsol rtke: `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "sszefrhetetlen kimenetistlus-kapcsolk" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Csak %s -ben: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "`-'-t nem lehet sszehasonltani egy knyvtrral" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D kapcsol nem tmogatott knyvtrak esetn" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Kzs alknyvtrak: %s s %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "A(z) %s fjl egy %s, viszont a(z) %s fjl egy %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "A(z) %s s a(z) %s fjlok klnbznek\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "%s s %s fjlok azonosak\n" @@ -1102,11 +1116,12 @@ msgid "incompatible options" msgstr "sszefrhetetlen kapcsolk" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' tbb mint egy bemeneti fjlhoz lett megadva" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "olvass sikertelen" @@ -1145,15 +1160,12 @@ msgid "" msgstr "-x --overlap-only Kirja az tfed vltoztatsokat." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Kirja az t nem vitt vltozsokat, zrjelezi az " -"tkzseket." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Hozzfzi a `w' s a`q' parancsokat az ed-parancsfjlhoz." #: src/diff3.c:438 @@ -1195,9 +1207,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Az sszes fjlt szvegknt kezeli" +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1250,30 +1261,30 @@ msgstr "bels hiba: rvnytelen sszehasonltsi tpus a process_diff-ben" msgid "invalid diff format; invalid change separator" msgstr "rvnytelen sszehasonlts-formtum; rvnytelen vltozselvlaszt" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "rvnytelen sszehasonlts-formtum; befejezetlen utols sor" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "`%s' segdprogram nem indthat" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "rvnytelen sszehasonltsi formtum; rossz sor eleji karakter" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "bels hiba: rvnytelen sszehasonltsi tpus kerlt a kimenetre" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "a bementi fjl sszement" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "nem lehet a(z) `%s' s a(z) `%s' fjlneveket sszehasonltani" #: src/dir.c:209 @@ -1286,93 +1297,99 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o FJL --output=FJL Interaktvan dolgozik, a kimenetet a FJL-ba kldi." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case A kis- s nagybetket azonosnak tekinti." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Nem figyeli a tab/szkz csert." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Nem figyel semmilyen res helyet." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Nem figyeli az res helyek vltoztatst." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Nem figyel semmilyen res helyet." +msgstr "-W --ignore-all-space Figyelmen kvl hagy minden res helyet." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Figyelmen kvl hagyja az res sorokat." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RK --ignore-matching-lines=RK Nem figyeli a RK-re illeszked sorokat." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr A bemenetbl elhagyja a befejez kocsivissza " "karaktereket." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Az sszes fjlt szvegknt kezeli" -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "-w SZM --width=SZM Legfeljebb SZM szles kimenet (alapbl 130)." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column A kzs sorokat csak bal oldra rja ki." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nem rja ki a kzs sorokat." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs A tabultorokat szkzzel helyettesti a kimenetben." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" "--tabsize=NUM Tabultorpozci minden NUM. nyomtatsi oszlopban (alapbl 8)." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Megprbl kevesebb klnbsget tallni." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1380,42 +1397,41 @@ msgstr "" "-H --speed-large-files Nagy fjlokat felttelez sok, elszrt, kis " "vltozssal." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" "--diff-program=PROGRAM A PROGRAM-ot hasznlja a fjlok\n" " sszehasonltshoz." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Az sszes fjlt szvegknt kezeli" +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version A kimenet a verziszm." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Hasznlat: %s [KAPCSOL]... FJL1 FJL2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Egyms mellett jelenti a fjlokat s a klnbsgeiket." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "nem lehet interaktvan sszefzni a szabvnyos bemenetet." -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "mindkt sszehasonltand fjl knyvtr" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1440,58 +1456,45 @@ msgstr "" "v:\tAz azonos sorok beptse figyelmeztetssel.\n" "q:\tKilps.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: nem megengedett kapcsol -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Ez szabad szoftver; a sokszorostsra vonatkoz feltteleket lsd a " +#~ "forrsban.\n" +#~ "SEMMILYEN garancit nem vllalunk, mg azt sem lltjuk, hogy ez a " +#~ "program\n" +#~ "KERESKEDELMI CLOKRA ALKALMAS vagy HASZNLHAT EGY ADOTT FELADATRA.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i UGRS1:UGRS2 --ignore-initial=UGRS1:UGRS2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent Nincs kimenet, csak visszatrsi rtk." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version A kimenet a verziszm." - #~ msgid "--help Output this help." #~ msgstr "--help Kirja ezt a segtsget." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Hrom fjlt hasonlt ssze sorrl sorra." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion Nem figyeli a tab/szkz csert." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Nem figyeli az res helyek vltoztatst." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Figyelmen kvl hagy minden res helyet." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines Figyelmen kvl hagyja az res sorokat." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "A hibkat <bug-gnu-utils@gnu.org> cmre krjk jelenteni." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr A bemenetbl elhagyja a befejez kocsivissza " -#~ "karaktereket." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "a `-%ld' kapcsol elavult; hasznlja a `-%c %ld' kapcsolt " -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Az sszes fjlt szvegknt kezeli" +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "a `-%ld' kapcsol elavult; ne hasznlja" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1505,10 +1508,6 @@ msgstr "" #~ " -F RK --show-function-line=RK Megmutatja a legkzelebbi RK-ra " #~ "illeszked sort." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed A kimenet egy ed-parancsfjl." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1520,38 +1519,12 @@ msgstr "" #~ " --left-column A kzs sorokat csak bal oldalon rja ki.\n" #~ " --suppress-common-lines Nem rja ki a kzs sorokat." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t --expand-tabs A tabultorokat szkzzel helyettesti a kimenetben." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab A tabultorok helyesen jelennek meg a kezd " -#~ "tabultornak ksznheten." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NUM Tabultorpozci minden NUM. nyomtatsi oszlopban (alapbl " -#~ "8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Megprbl kevesebb klnbsget tallni." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Nagy fjlokat felttelez sok, elszrt, kis " #~ "vltozssal." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Kirja az sszes vltozst, zrjelezi az tkzseket." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr " -X Kirja s zrjelezi az tfed vltoztatsokat." @@ -1563,81 +1536,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L CMKE --label=CMKE A CMK-t hasznlja fjlnv helyet." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=PROGRAM A PROGRAM-ot hasznlja a fjlok\n" -#~ " sszehasonltshoz." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Figyelmen kvl hagy minden res helyet." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w SZM --width=SZM Legfeljebb SZM szles kimenet (alapbl 130)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column A kzs sorokat csak bal oldra rja ki." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Nagy fjlokat felttelez sok, elszrt, kis " -#~ "vltozssal." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "olvass sikertelen" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "az rs sikertelen" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "olvass sikertelen" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "olvass sikertelen" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "az rs sikertelen" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "az rs sikertelen" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: nem megengedett kapcsol -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Ez szabad szoftver; a sokszorostsra vonatkoz feltteleket lsd a " -#~ "forrsban.\n" -#~ "SEMMILYEN garancit nem vllalunk, mg azt sem lltjuk, hogy ez a " -#~ "program\n" -#~ "KERESKEDELMI CLOKRA ALKALMAS vagy HASZNLHAT EGY ADOTT FELADATRA.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "A hibkat <bug-gnu-utils@gnu.org> cmre krjk jelenteni." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "a `-%ld' kapcsol elavult; hasznlja a `-%c %ld' kapcsolt " - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "a `-%ld' kapcsol elavult; ne hasznlja" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "`%s' segdprogram nem tallhat" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.9\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2010-02-14 08:00+0700\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -25,7 +25,7 @@ msgstr "kesalahan program" msgid "stack overflow" msgstr "overflow stack" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" @@ -138,100 +138,102 @@ msgstr "%s: pilihan '%s' membutuhkan sebuah argumen\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "`" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "'" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sukses" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Tidak cocok" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ekspresi reguler tidak valid" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Karakter kolasi tidak valid" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nama kelas karakter tidak valid" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Akhiran backslash" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Referensi balik tidak valid" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Tidak cocok [ atau [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Tidak cocok ( atau \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Tidak cocok \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Isi dari \\{\\} tidak valid" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Batas akhir tidak valid" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Kehabisan memori" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Ekspresi reguler yang mengawali tidak valid" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Ekspresi reguler berakhir dengan prematur" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Ekspresi reguler terlalu besar" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Tidak cocok ) atau \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Tidak ada ekspresi reguler sebelumnya" @@ -261,18 +263,18 @@ msgid "failed to reopen %s with mode %s" msgstr "gagal untuk membuka kembali %s dengan mode %s" #: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid %s%s argument '%s'" msgstr "argumen %s%s tidak valid `%s'" #: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid suffix in %s%s argument '%s'" msgstr "akhiran dalam argumen %s%s tidak valid `%s'" #: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument `%s' too large" +#, fuzzy, c-format +msgid "%s%s argument '%s' too large" msgstr "%s%s argumen `%s' terlalu besar" #: lib/version-etc.c:74 @@ -450,7 +452,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Bantuan umum menggunakan perangkat lunak GNU: <http://www.gnu.org/gethelp>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Berkas %s dan %s berbeda\n" @@ -460,7 +462,7 @@ msgstr "Berkas %s dan %s berbeda\n" msgid "Binary files %s and %s differ\n" msgstr "File biner %s dan %s berbeda\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Tidak ada baris-baru di akhir dari berkas" @@ -474,14 +476,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Coba `%s --help' untuk informasi lebih lanjut." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "tidak valid --ignore-initial nilai `%s'" #: src/cmp.c:147 @@ -489,14 +491,14 @@ msgstr "tidak valid --ignore-initial nilai `%s'" msgid "options -l and -s are incompatible" msgstr "pilihan -l dan -s tidak kompatibel" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "gagal menulis" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standar keluaran" @@ -558,7 +560,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "SKIP1 dan SKIP2 adalah jumlah byte yang harus dilewati di tiap file." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -574,27 +576,28 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, dan seterusnya untuk T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Jika sebuah FILE adalah `-' atau tidak ada, baca input standar" -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status keluar adalah 0 jika masukan sama, 1 jika berbeda, 2 jika bermasalah." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "nilai --byte tidak valid `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "tidak ada operand setelah `%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "operand ekstra `%s'" #: src/cmp.c:491 @@ -613,165 +616,162 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF pada %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "panjang context tidak valid `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "paginasi tidak didukung pada host ini" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "terlalu banyak option label file" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "lebar tidak valid `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "option lebar konflik" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "panjang horizon tidak valid `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "tabsize tidak valid `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "option tabsize konflik" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file dan --to-file keduanya disebutkan" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Output normal diff." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Tampilkan hanya apakah file berbeda." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Laporkan ketika dua file sama." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Perlakukan seluruh file sebagai teks." +msgstr "-e --ed Output adalah script ed." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Output dalam format RCS diff." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Tampilkan informasi versi." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Hanya tampilkan kolom kiri baris yang sama." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Jangan tampilkan baris yang sama." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Ekspansi tab ke spasi dalam output." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Buat tab beraturan dg menambahkan sebuah tab." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NUM Tab stop adalah setiap NUM (default 8) kolom cetakan." -#: src/diff.c:871 +#: src/diff.c:874 #, fuzzy msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" @@ -779,52 +779,56 @@ msgstr "" "--suppress-blank-empty Tekan spasi atau tab sebelum mengeluarkan baris " "kosong." -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Berikan output ke `pr' untuk di-paginate." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Membandingkan subdirektori secara rekursif." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Perlakukan tiada file sebagai kosong." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Anggap file tidak ada pertama sebagai kosong." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Abaikan case saat membandingkan nama file." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Pertimbangkan case saat membandingkan nama file." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Tanpa file yang cocok dengan PAT." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X FILE --exclude-from=FILE Abaikan file yang cocok dengan pola dalam FILE" -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -832,7 +836,7 @@ msgstr "" "-S FILE --starting-file=FILE Mulai dengan FILE ketika membandingkan " "direktori." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -841,7 +845,7 @@ msgstr "" "--from-file=FILE1 Bandingkan FILE1 ke semua operand. FILE1 dapat berupa " "direktori." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -850,97 +854,98 @@ msgstr "" "--to-file=FILE2 Bandingkan semua operand dengan FILE2. FILE2 dapat berupa " "direktori." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Abaikan beda case dalam isi file." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Abaikan perubahan akibat ekspansi tab." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Abaikan seluruh white space." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Abaikan perubahan sejumlah white space." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Abaikan seluruh white space." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Abaikan perubahan baris kosong." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Abaikan perubahan baris yang cocok dg RE." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Perlakukan seluruh file sebagai teks." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Hapus trailing carriage return pada input." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Baca dan tulis data dalam mode biner." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NAME --ifdef=NAME Output file merge untuk tampilkan `#ifdef NAME' diffs." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Serupa, tapi format input kelompok GTYPE dg GFMT. " -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT Serupa, tapi format seluruh baris input dg LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Serupa, tapi format baris input LTYPE dg LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE adalah `old', `new', atau `unchanged'. GTYPE adalah LTYPE atau " "`changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -969,7 +974,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -982,7 +987,7 @@ msgstr "" " %l isi baris, tanpa baris baru\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec untuk nomor baris input" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -996,17 +1001,17 @@ msgstr "" " %c'C' karakter tunggal C\n" " %c'\\OOO' karakter dengan kode oktal OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Usahakan mencari perubahan terkecil." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM Pertahankan NUM baris prefiks dan suffiks umum." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1014,77 +1019,85 @@ msgstr "" "-H --speed-large-files Asumsikan file besar dan banyak sebaran perubahan " "kecil." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Tampilkan informasi versi." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FILES adalah `FILE1 FILE2' atau `DIR1 DIR2' atau `DIR FILE...' atau `FILE... " "DIR'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Bila --from-file atau --to-file diberikan, tidak ada batasan untuk FILES." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Jika sebuah file FILE adalah `-', baca standard input." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Penggunaan: %s [OPTION]... FILES\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Bandingkan file baris per baris" -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "Nilai option %s konflik dengan `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "option gaya output konflik" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Hanya dalam %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "tidak dapat membandingkan `-' dg direktori" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D option tidak didukung dg direktori" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirektori sama: %s dan %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "File %s adalah %s sementara file %s adalah %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Berkas %s dan %s berbeda\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "File %s dan %s identik\n" @@ -1100,11 +1113,12 @@ msgid "incompatible options" msgstr "option tidak kompatibel" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' dispesifikasikan lebih dari satu file input" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "gagal membaca" @@ -1141,13 +1155,12 @@ msgid "" msgstr "-x --overlap-only Tampilkan perubahan yang overlap." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap Output perubahan unmerge, konflik dl tanda kurung." +msgstr "" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Tambah perintah `w' dan `q' ke script ed." #: src/diff3.c:438 @@ -1183,9 +1196,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Perlakukan seluruh file sebagai teks." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1237,30 +1249,30 @@ msgstr "kesalahan internal: tipe diff tidak valid dalam process_diff" msgid "invalid diff format; invalid change separator" msgstr "format diff tidak valid; separator perubahan tidak valid" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "format diff tidak valid; baris akhir tidak lengkap" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "program subsider `%s' tidak dipanggil" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "format diff tidak valid; karakter leading line tidak tepat" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "kesalahan internal: tipe diff tidak valid dimasukkan ke output" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "file input mengecil" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "tidak dapat membandingkan nama file `%s' dan `%s'" #: src/dir.c:209 @@ -1273,90 +1285,96 @@ msgstr "%s: rekursif loop direktori" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o FILE --output=FILE Operasi secara interaktif, kirim output ke FILE." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Abaikan huruf kapital dan huruf kecil." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion Abaikan perubahan akibat ekspansi tab." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Abaikan seluruh white space." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Abaikan perubahan sejumlah white space." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Abaikan seluruh white space." +msgstr "-W --ignore-all-space Abaikan seluruh white space." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Abaikan perubahan baris kosong." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE Abaikan perubahan baris yang cocok dg RE." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Hapus trailing carriage return pada input." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Perlakukan seluruh file sebagai teks." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Hanya tampilkan kolom kiri baris yang sama." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Jangan tampilkan baris yang sama." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Ekspansi tab ke spasi dalam output." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=NUM Tab stop adalah setiap NUM (default 8) kolom cetakan." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Usahakan mencari perubahan terkecil." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1364,40 +1382,39 @@ msgstr "" "-H --speed-large-files Asumsikan file besar dan banyak sebaran perubahan " "kecil." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Gunakan PROGRAM untuk membandingkan file." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Perlakukan seluruh file sebagai teks." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Tampilkan informasi versi." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Pemakaian: %s [OPTION]... FILE1 FILE2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Merge side-by-side beda file." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "tidak dapat menggabung input standar secara interaktif" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "kedua file yang dibandingkan adalah direktori" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1429,49 +1446,15 @@ msgstr "" #~ "-s --quiet --silent Tidak mengeluarkan apapun; hanya memberikan status " #~ "keluar saja." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Tampilkan informasi versi." - #~ msgid "--help Output this help." #~ msgstr "--help Tampilkan bantuan ini." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Bandingkan tiga file baris per baris." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion Abaikan perubahan akibat ekspansi tab." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Abaikan perubahan sejumlah white space." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Abaikan seluruh white space." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines Abaikan perubahan baris kosong." - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Hapus trailing carriage return pada input." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Perlakukan seluruh file sebagai teks." - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1482,10 +1465,6 @@ msgstr "" #~ " -F RE --show-function-line=RE Tampilkan baris paling akhir yang cocok " #~ "dengan RE." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Output adalah script ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1497,33 +1476,11 @@ msgstr "" #~ " --left-column Output hanya kolom kiri baris bersama.\n" #~ " --suppress-common-lines Jangan hasilkan baris bersama." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Ekspansi tab ke spasi dalam output." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Buat tab beraturan dg menambahkan sebuah tab." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NUM Tab stop adalah setiap NUM (default 8) kolom cetakan." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Usahakan mencari perubahan terkecil." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Asumsikan file besar dan banyak perubahan kecil." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Output seluruh perubahan, konflik dalam tanda kurung." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Output perubahan overlap, beri tanda kurung." @@ -1533,54 +1490,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L LABEL --label=LABEL Gunakan LABEL bukan nama file." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAM Gunakan PROGRAM untuk membandingkan file." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Abaikan seluruh white space." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Hanya tampilkan kolom kiri baris yang sama." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Asumsikan file besar dan banyak perubahan kecil." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "gagal membaca" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "gagal menulis" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "gagal membaca" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "gagal membaca" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "gagal menulis" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "gagal menulis" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: pilihan -- %c tidak legal\n" @@ -1,14 +1,14 @@ # Italian messages for diffutils. # Copyright (C) 2004, 2005, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# Marco Colombo <m.colombo@ed.ac.uk>, 2004, 2005, 2010. +# Marco Colombo <m.colombo@ed.ac.uk>, 2004, 2005, 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.0\n" +"Project-Id-Version: diffutils 3.2\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2010-08-18 16:25+0100\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2011-09-14 16:26+0100\n" "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" @@ -24,7 +24,7 @@ msgstr "errore del programma" msgid "stack overflow" msgstr "overflow dello stack" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" @@ -82,9 +82,9 @@ msgid "weird file" msgstr "file strano" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: l'opzione '%s' è ambigua\n" +msgstr "%s: l'opzione '%s' è ambigua; alternative:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format @@ -138,100 +138,102 @@ msgstr "%s: l'opzione '-W %s' richiede un argomento\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "'" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "'" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Successo" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nessuna corrispondenza" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Espressione regolare non valida" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Carattere di collazione non valido" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nome della classe di caratteri non valido" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Backslash finale" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Riferimento all'indietro non valido" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ o [^ non accoppiata" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( o \\( non accoppiata" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ non accoppiata" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Contenuto di \\{\\} non valido" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Fine dell'intervallo non valida" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memoria esaurita" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "L'espressione regolare precedente non è valida" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fine prematura dell'espressione regolare" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "L'espressione regolare è troppo grande" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") o \\) non accoppiata" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Non c'è una espressione regolare precedente" @@ -261,19 +263,19 @@ msgid "failed to reopen %s with mode %s" msgstr "riapertura di %s in modalità %s non riuscita" #: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument `%s'" -msgstr "" +#, fuzzy, c-format +msgid "invalid %s%s argument '%s'" +msgstr "argomento '%3$s' di %1$s%2$s non valido" #: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "" +#, fuzzy, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "suffisso '%3$s' non valido nell'argomento di %1$s%2$s" #: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument `%s' too large" -msgstr "" +#, fuzzy, c-format +msgid "%s%s argument '%s' too large" +msgstr "argomento '%3$s' di %1$s%2$s troppo grande" #: lib/version-etc.c:74 #, c-format @@ -449,7 +451,7 @@ msgstr "%s home page: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Aiuto sull'uso di software GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "I file %s e %s sono diversi\n" @@ -459,7 +461,7 @@ msgstr "I file %s e %s sono diversi\n" msgid "Binary files %s and %s differ\n" msgstr "I file binari %s e %s sono diversi\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Manca newline alla fine del file" @@ -473,14 +475,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Usare '%s --help' per maggiori informazioni." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "Valore '%s' non valido per --ignore-initial" #: src/cmp.c:147 @@ -488,65 +490,61 @@ msgstr "Valore '%s' non valido per --ignore-initial" msgid "options -l and -s are incompatible" msgstr "le opzioni -l e -s sono incompatibili" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "scrittura non riuscita" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standard output" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes Stampa i byte differenti." +msgstr "-b, --print-bytes Stampa i byte differenti" #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" -msgstr "-i SKIP --ignore-initial=SKIP Salta i primi SKIP byte di input." +msgstr "" +"-i, --ignore-initial=SKIP Salta i primi SKIP byte di entrambi gli input" # Lo strano allineamento è corretto #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" -" Salta i primi SKIP1 byte di FILE1 e i primi " -"SKIP2\n" -" byte di FILE2." +"-i, --ignore-initial=SKIP1:SKIP2 Salta i primi SKIP1 byte di FILE1 e i " +"primi\n" +" SKIP2 byte di FILE2" # Lo strano allineamento della seconda riga è corretto. #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" -"-l --verbose Mostra i numeri e i valori di tutti i byte\n" -" differenti." +"-l, --verbose Mostra i numeri e i valori di tutti i byte\n" +" differenti" # Solitamente viene usato NUM quando si vuole specificare un numero. #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n NUM --bytes=NUM Confronta al massimo NUM byte." +msgstr "-n, --bytes=NUM Confronta al massimo NUM byte" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent Sopprime tutto l'output normale" #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help Mostra questo aiuto ed esce" #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Stampa le informazioni sulla versione." +msgstr "" +"-v, --version Stampa le informazioni sulla versione ed esce" #: src/cmp.c:178 #, c-format @@ -558,16 +556,19 @@ msgid "Compare two files byte by byte." msgstr "Confronta due file byte per byte." #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." -msgstr "SKIP1 e SKIP2 sono il numero di byte da saltare in ogni file." +msgstr "" +"I valori opzionali SKIP1 e SKIP2 indicano il numero di byte da saltare\n" +"all'inizio di ogni file (zero se non indicato)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle " +"corte.\n" #: src/cmp.c:191 msgid "" @@ -581,28 +582,29 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, e così via per T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Se un FILE è '-' o è mancante, legge lo standard input." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" -"Lo stato d'uscita è 0 quando gli input sono identici, 1 quando sono " -"differenti, 2 quando si riscontrano dei problemi." +"Il codice d'uscita è 0 se gli input sono identici, 1 se sono differenti, 2 " +"quando si riscontrano dei problemi." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "valore '%s' non valido per --bytes" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "operando mancante dopo '%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "extra operando '%s'" #: src/cmp.c:491 @@ -621,319 +623,301 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF in %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "lunghezza di contesto '%s' non valida" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "paginazione non supportata su questo host" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "troppe opzioni di etichetta" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "larghezza '%s' non valida" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "opzioni di larghezza in conflitto" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "lunghezza di orizzonte '%s' non valida" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "lunghezza di tabulazione '%s' non valida" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "opzioni di lunghezza di tabulazione in conflitto" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file e --to-file specificati entrambi" -#: src/diff.c:851 -#, fuzzy +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" -msgstr "--normal Mostra una diff normale." +msgstr " --normal Mostra una diff normale (predefinito)" -#: src/diff.c:852 -#, fuzzy +#: src/diff.c:855 msgid "-q, --brief report only when files differ" -msgstr "-q --brief Segnala solo se i file sono diversi." +msgstr "-q, --brief Segnala solo se i file sono diversi" -#: src/diff.c:853 -#, fuzzy +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" -msgstr "-s --report-identical-files Segnala quando due file sono identici." +msgstr "-s, --report-identical-files Segnala quando due file sono identici" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NUM --width=NUM Mostra al massimo NUM colonne (predefinito 130)." +"-c, -C NUM, --context[=NUM] Mostra NUM righe di contesto copiato\n" +" (predefinito 3)" -#: src/diff.c:855 -#, fuzzy +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-w NUM --width=NUM Mostra al massimo NUM colonne (predefinito 130)." +"-u, -U NUM, --unified[=NUM] Mostra NUM righe di contesto unificato\n" +" (predefinito 3)" -#: src/diff.c:856 -#, fuzzy +#: src/diff.c:859 msgid "-e, --ed output an ed script" -msgstr "-a --text Considera tutti i file come testo." +msgstr "-e, --ed Mostra uno script per ed" -#: src/diff.c:857 -#, fuzzy +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs Mostra una diff in formato RCS." +msgstr "-n, --rcs Mostra una diff in formato RCS" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Stampa le informazioni sulla versione." +msgstr "-y, --side-by-side Output in due colonne" -#: src/diff.c:859 -#, fuzzy +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w NUM --width=NUM Mostra al massimo NUM colonne (predefinito 130)." +"-W, --width=NUM Mostra al massimo NUM colonne (predefinito 130)" # Lo strano allineamento della seconda riga è corretto. -#: src/diff.c:860 -#, fuzzy +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" -"-l --left-column Mostra solo la colonna di sinistra per le righe\n" -" in comune." +" --left-column Mostra solo la colonna di sinistra per le " +"righe\n" +" in comune" -#: src/diff.c:861 -#, fuzzy +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Non mostra le righe in comune." +msgstr " --suppress-common-lines Non mostra le righe in comune" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" +"-p, --show-c-function Mostra in quale funzione C si trova ogni\n" +" differenza" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" +"-F, --show-function-line=ER Mostra la riga più recente che corrisponde\n" +" all'espressione regolare ER" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" +" --label ETICHETTA Usa ETHICHETTA invece del nome del file\n" +" (può essere ripetuta)" -#: src/diff.c:868 -#, fuzzy +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t --expand-tabs Espande le tabulazioni in spazi nell'output." +"-t, --expand-tabs Espande le tabulazioni in spazi nell'output" -#: src/diff.c:869 -#, fuzzy +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Allinea le tabulazioni usando una tabulazione." +"-T, --initial-tab Allinea le tabulazioni usando una tabulazione" -#: src/diff.c:870 -#, fuzzy +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -"--tabsize=NUM Stop di tabulazione ogni NUM colonne\n" -" (predefinito 8)." +" --tabsize=NUM Stop di tabulazione ogni NUM colonne\n" +" (predefinito 8)" -#: src/diff.c:871 -#, fuzzy +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -"--suppress-blank-empty Rimuove gli spazi o le tabulazioni prima di " -"righe di\n" -" output vuote." +" --suppress-blank-empty Rimuove spazi e tabulazioni prima di righe\n" +" di output vuote" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-l --paginate Passa l'output attraverso 'pr' per impaginarlo." +"-l, --paginate Passa l'output attraverso 'pr' per impaginarlo" -#: src/diff.c:874 -#, fuzzy +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" -"-r --recursive Confronta ricorsivamente ogni sottodirectory\n" -" incontrata." +"-r, --recursive Confronta ricorsivamente ogni sottodirectory\n" +" incontrata" -#: src/diff.c:875 -#, fuzzy +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file Considera i file mancanti come vuoti." +msgstr "-N, --new-file Considera i file mancanti come vuoti" -#: src/diff.c:876 -#, fuzzy +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -"--unidirectional-new-file Considera i file mancanti in prima posizione\n" -" come vuoti." +" --unidirectional-new-file Considera i file mancanti in prima posizione\n" +" come vuoti" -#: src/diff.c:877 -#, fuzzy +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -"--ignore-file-name-case Ignora differenze in maiuscole e minuscole\n" -" confrontando nomi di file." +" --ignore-file-name-case Ignora differenze in maiuscole e minuscole\n" +" confrontando nomi di file" -#: src/diff.c:878 -#, fuzzy +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -"--no-ignore-file-name-case Considera differenze in maiuscole e minuscole\n" -" confrontando nomi di file." +" --no-ignore-file-name-case Considera differenze in maiuscole e " +"minuscole\n" +" confrontando nomi di file" -#: src/diff.c:879 -#, fuzzy +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" -"-x MODELLO --exclude=MODELLO Esclude i file che corrispondono al MODELLO." +"-x, --exclude=MODELLO Esclude i file che corrispondono al MODELLO" -#: src/diff.c:880 -#, fuzzy +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X FILE --exclude-from=FILE Esclude i file che corrispondono a ogni\n" -" modello in FILE." +"-X, --exclude-from=FILE Esclude i file che corrispondono a qualsiasi\n" +" modello in FILE" -#: src/diff.c:881 -#, fuzzy +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -"-S FILE --starting-file=FILE Comincia con FILE quando si confrontano\n" -" directory." +"-S, --starting-file=FILE Comincia da FILE quando si confrontano " +"directory" -#: src/diff.c:882 -#, fuzzy +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=FILE1 Confronta FILE1 con tutti gli operandi.\n" -" FILE1 può essere una directory." +" --from-file=FILE1 Confronta FILE1 con tutti gli operandi;\n" +" FILE1 può essere una directory" -#: src/diff.c:884 -#, fuzzy +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=FILE2 Confronta tutti gli operandi con FILE2.\n" -" FILE2 può essere una directory." +" --to-file=FILE2 Confronta tutti gli operandi con FILE2;\n" +" FILE2 può essere una directory" -#: src/diff.c:887 -#, fuzzy +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -"-i --ignore-case Ignora differenze in maiuscole e minuscole nel\n" -" contenuto del file." +"-i, --ignore-case Ignora differenze in maiuscole e minuscole " +"nel\n" +" contenuto del file" -#: src/diff.c:888 -#, fuzzy +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Ignora differenze causate dall'espansione\n" -" delle tabulazioni." +"-E, --ignore-tab-expansion Ignora differenze causate dall'espansione\n" +" delle tabulazioni" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Ignora tutti gli spazi." +msgstr "-Z, --ignore-trailing-space Ignora gli spazi a fine riga" -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change Ignora differenze nel numero di spazi." +msgstr "-b, --ignore-space-change Ignora differenze nel numero di spazi" -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignora tutti gli spazi." +msgstr "-w, --ignore-all-space Ignora tutti gli spazi" -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines Ignora differenze in righe vuote." +"-B, --ignore-blank-lines ignore changes where lines are all blank" +msgstr "-B, --ignore-blank-lines Ignora differenze in righe vuote" -#: src/diff.c:893 src/sdiff.c:178 +# Lo strano allineamento della seconda riga è corretto +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I ER --ignore-matching-lines=ER Ignora differenze che corrispondono\n" -" all'espressione regolare ER." +"-I, --ignore-matching-lines=ER Ignora differenze che corrispondono\n" +" all'espressione regolare ER" -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:899 msgid "-a, --text treat all files as text" -msgstr "-a --text Considera tutti i file come testo." +msgstr "-a, --text Considera tutti i file come testo" -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimina i ritorni a capo a fine riga in input." +" --strip-trailing-cr Elimina i ritorni a capo a fine riga in input" -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:902 msgid " --binary read and write data in binary mode" -msgstr "--binary Leggi e scrivi in modalità binaria." +msgstr " --binary Legge e scrive in modalità binaria" # Con questa opzione, i due file originali sono uniti in un unico file che # viene stampato sullo standard output. Le differenze sono mostrate così: @@ -946,47 +930,44 @@ msgstr "--binary Leggi e scrivi in modalità binaria." # #endif /* NOME */ # Testo comune. # -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D NOME --ifdef=NOME Mostra le differenze in un unico file usando\n" -" '#ifdef NOME'." +"-D, --ifdef=NOME Mostra le differenze in un unico file usando\n" +" '#ifdef NOME'" -#: src/diff.c:902 -#, fuzzy +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -"--GTYPE-group-format=GFMT Simile, ma formatta i gruppi di input GTYPE\n" -" con GFMT." +" --GTYPE-group-format=GFMT Simile, ma formatta i gruppi di input GTYPE\n" +" con GFMT" -#: src/diff.c:903 -#, fuzzy +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -"--line-format=LFMT Simile, ma formatta tutte le righe di input\n" -" con LFMT." +" --line-format=LFMT Formatta tutte le righe di input con LFMT" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -"--LTYPE-line-format=LFMT Simile, ma formatta le righe di input LTYPE\n" -" con LFMT." +" --LTYPE-line-format=LFMT Formatta le righe di input LTYPE con LFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +" Queste opzioni di formato forniscono un controllo preciso dell'output di\n" +" diff, generalizzando -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr " LTYPE è 'old', 'new', o 'unchanged'. GTYPE è LTYPE o 'changed'." -#: src/diff.c:908 -#, fuzzy +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1001,7 +982,7 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -" GFMT può contenere:\n" +" GFMT può (solo) contenere:\n" " %< righe dal FILE1\n" " %> righe dal FILE2\n" " %= righe comuni a FILE1 e FILE2\n" @@ -1013,10 +994,10 @@ msgstr "" " L numero dell'ultima riga\n" " N numero di righe = L-F+1\n" " E F-1\n" -" M L+1" +" M L+1\n" +" %(A=B?T:E) se A è uguale a B allora T, altrimenti E" -#: src/diff.c:920 -#, fuzzy +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1026,11 +1007,10 @@ msgstr "" " LFMT può contenere:\n" " %L contenuto della riga\n" " %l contenuto della riga, ad esclusione di ogni andata a capo finale\n" -" %[-][LARGHEZZA][.[PREC]]{doxX}n formato in stile printf del\n" -" numero di riga di input" +" %[-][LARGHEZZA][.[PREC]]{doxX}n formato in stile printf del numero\n" +" di riga di input" -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1038,99 +1018,103 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -" GFMT o LFMT possono contenere:\n" -" %% %\n" -" %c'C' il carattere C\n" -" %c'\\OOO' il carattere con codice ottale OOO" +" GFMT e LFMT possono contenere:\n" +" %% %\n" +" %c'C' il singolo carattere C\n" +" %c'\\OOO' il carattere con codice ottale OOO\n" +" C il carattere C (altri caratteri rappresentano se stessi)" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Minimizza il numero di differenze." +msgstr "-d, --minimal Minimizza il numero di differenze" -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -"--horizon-lines=NUM Mantiene NUM righe di prefisso e suffisso comune." +" --horizon-lines=NUM Mantiene NUM righe di prefisso e suffisso comune" -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" -"-H --speed-large-files Assume file grandi e tante piccole differenze." +" --speed-large-files Assume file grandi e tante piccole differenze" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" -msgstr "" +msgstr " --help Mostra questo aiuto ed esce" -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:939 msgid "-v, --version output version information and exit" -msgstr "-v --version Stampa le informazioni sulla versione." +msgstr "" +"-v, --version Stampa le informazioni sulla versione ed esce" -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FILES sono 'FILE1 FILE2' o 'DIR1 DIR2' o 'DIR FILE...' o 'FILE... DIR'." -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se --from-file o --to-file sono usati, non ci sono restrizioni per FILES." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Se un FILE è '-', legge lo standard input." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uso: %s [OPZIONE]... FILES\n" -#: src/diff.c:950 -#, fuzzy +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Confronta i file riga per riga." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "conflitto nell'opzione %s: valore '%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "opzioni di stile di output in conflitto" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Solo in %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "impossibile confrontare '-' con una directory" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "opzione -D non supportata con directory" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Sottodirectory in comune: %s e %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "File %s è un %s mentre file %s è un %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "I file %s e %s sono diversi\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "I file %s e %s sono identici\n" @@ -1146,11 +1130,12 @@ msgid "incompatible options" msgstr "opzioni incompatibili" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "'-' specificato per più di un file di input" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lettura fallita" @@ -1170,11 +1155,10 @@ msgstr "lettura fallita" # # Lo strano allineamento della seconda riga è corretto. #: src/diff3.c:428 -#, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -"-A --show-all Mostra tutte le differenze, tenendo separati\n" -" i conflitti." +"-A, --show-all Mostra tutte le differenze, tenendo separati\n" +" i conflitti" # Per mostrare i diversi output generati con le varie opzioni di diff3, # ho usato i seguenti file: @@ -1194,13 +1178,12 @@ msgstr "" # # Lo strano allineamento della seconda riga è corretto. #: src/diff3.c:430 -#, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed Mostra cambiamenti da VECCHIOFILE a TUOFILE\n" -" in MIOFILE." +"-e, --ed Mostra uno script ed con i cambiamenti\n" +" da VECCHIOFILE a TUOFILE in MIOFILE" # Questa opzione produce: # @@ -1215,21 +1198,18 @@ msgstr "" # . # #: src/diff3.c:432 -#, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" -msgstr "" -"-E --show-overlap Mostra le differenze, tenendo separati i " -"conflitti." +msgstr "-E, --show-overlap Come -e, tenendo separati i conflitti" # Questa opzione, per i 3 file considerati, non produce niente. # #: src/diff3.c:433 -#, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -"-3 --easy-only Mostra le differenze che non si sovrappongono." +"-3 --easy-only Come -e, ma mostra solo i cambiamenti che non\n" +" si sovrappongono" # Questa opzione produce: # @@ -1239,79 +1219,64 @@ msgstr "" # . # #: src/diff3.c:434 -#, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only Mostra le differenze che si sovrappongono." +msgstr "" +"-x, --overlap-only Come -e, ma mostra solo i cambiamenti che si\n" +" sovrappongono" -# Questa opzione produce: -# -# diff3 -E file1 file2 file3 -# 2a -# ======= -# Questo è il file 3. -# >>>>>>> file3 -# . -# 1a -# <<<<<<< file1 -# . -# #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "" -"-E --show-overlap Mostra le differenze, tenendo separati i " -"conflitti." +msgstr "-X Come -x, ma tiene separati i conflitti" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -"-i Aggiunge i comandi 'w' e 'q' agli script per ed." +"-i Aggiunge i comandi 'w' e 'q' agli script per ed" #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge Mostra il file combinato risultante, secondo -A\n" +" se non è indicata nessun'altra opzione" #: src/diff3.c:441 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Considera tutti i file come testo." +msgstr "-a, --text Considera tutti i file come testo" #: src/diff3.c:442 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimina i ritorni a capo a fine riga in input." +" --strip-trailing-cr Elimina i ritorni a capo a fine riga in input" #: src/diff3.c:443 -#, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Allinea le tabulazioni usando una tabulazione." +"-T, --initial-tab Allinea le tabulazioni usando una tabulazione" #: src/diff3.c:444 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" -msgstr "--diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file." +msgstr " --diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file" #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=ETICHETTA Usa ETICHETTA invece del nome del file\n" +" (può essere repetuta fino a tre volte)" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Considera tutti i file come testo." +msgstr " --help Mostra questo aiuto ed esce" #: src/diff3.c:449 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Stampa le informazioni sulla versione." +msgstr "" +"-v, --version Stampa le informazioni sulla versione ed esce" #: src/diff3.c:458 #, c-format @@ -1335,12 +1300,27 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"Il formato predefinito di output è una rappresentazione più o meno " +"leggibile\n" +"dei cambiamenti.\n" +"\n" +"Le opzioni -e, -E, -x, -X (e le opzioni lunghe corrispondenti) producono " +"uno\n" +"script per ed invece dell'output predefinito.\n" +"\n" +"Infine, l'opzione -m (--merge) indica a diff3 di combinare internamente i " +"file\n" +"e mostrare il file combinato. Per input non convenzionali, ciò è più " +"robusto\n" +"di ed.\n" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" -"Lo stato d'uscita è 0 se c'è successo, 1 se c'è conflitto, 2 se sono stati\n" -"riscontrati dei problemi." +"Il codice d'uscita è 0 in caso di successo, 1 in caso di conflitto, 2 se " +"sono\n" +"stati riscontrati dei problemi." #: src/diff3.c:675 msgid "internal error: screwup in format of diff blocks" @@ -1359,30 +1339,30 @@ msgstr "errore interno: tipo di diff non valido in process_diff" msgid "invalid diff format; invalid change separator" msgstr "formato di diff non valido; separatore di modifica non valido" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "formato di diff non valido; ultima riga incompleta" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "programma accessorio '%s' non può essere chiamato" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "formato di diff non valido; caratteri incorretti a inizio riga" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "errore interno: il tipo di diff passato all'output non è valido" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "il file di input è rimpicciolito" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "impossibile confrontare i nomi dei file '%s' e '%s'" #: src/dir.c:209 @@ -1396,143 +1376,131 @@ msgid "Thomas Lord" msgstr "Thomas Lord" # Lo strano allineamento della seconda riga è corretto. -#: src/sdiff.c:170 -#, fuzzy +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" -"-o FILE --output=FILE Lavora in modo interattivo, scrivendo l'output\n" -" in FILE." +"-o, --output=FILE Procede in modo interattivo, scrivendo l'output\n" +" in FILE" # Questa traduzione corrisponde a quella usata sopra per diff. -#: src/sdiff.c:172 -#, fuzzy +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" -msgstr "" -"-i --ignore-case Ignora differenze in maiuscole e minuscole." +msgstr "-i, --ignore-case Ignora differenze in maiuscole e minuscole" -#: src/sdiff.c:173 -#, fuzzy +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Ignora differenze causate dall'espansione\n" -" delle tabulazioni." +"-E, --ignore-tab-expansion Ignora differenze causate dall'espansione\n" +" delle tabulazioni" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Ignora tutti gli spazi." +msgstr "-Z, --ignore-trailing-space Ignora gli spazi a fine riga" -#: src/sdiff.c:175 -#, fuzzy +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change Ignora differenze nel numero di spazi." +msgstr "-b, --ignore-space-change Ignora differenze nel numero di spazi" -#: src/sdiff.c:176 -#, fuzzy +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignora tutti gli spazi." +msgstr "-W, --ignore-all-space Ignora tutti gli spazi" -#: src/sdiff.c:177 -#, fuzzy +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines Ignora differenze in righe vuote." +msgstr "-B, --ignore-blank-lines Ignora differenze in righe vuote" -#: src/sdiff.c:179 +# Lo strano allineamento della seconda riga è corretto +#: src/sdiff.c:181 #, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=ER Ignora differenze che corrispondono\n" +" all'espressione regolare ER" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimina i ritorni a capo a fine riga in input." +" --strip-trailing-cr Elimina i ritorni a capo a fine riga in input" -#: src/sdiff.c:180 -#, fuzzy +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" -msgstr "-a --text Considera tutti i file come testo." +msgstr "-a, --text Considera tutti i file come testo" -#: src/sdiff.c:182 -#, fuzzy +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w NUM --width=NUM Mostra al massimo NUM colonne (predefinito 130)." +"-w, --width=NUM Mostra al massimo NUM colonne (predefinito 130)" # Lo strano allineamento della seconda riga è corretto. -#: src/sdiff.c:183 -#, fuzzy +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" -"-l --left-column Mostra solo la colonna di sinistra per le righe\n" -" in comune." +"-l, --left-column Mostra solo la colonna di sinistra per le righe\n" +" in comune" -#: src/sdiff.c:184 -#, fuzzy +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Non mostra le righe in comune." +msgstr "-s, --suppress-common-lines Non mostra le righe in comune" -#: src/sdiff.c:186 -#, fuzzy +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t --expand-tabs Espande le tabulazioni in spazi nell'output." +"-t, --expand-tabs Espande le tabulazioni in spazi nell'output" -#: src/sdiff.c:187 -#, fuzzy +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" "--tabsize=NUM Stop di tabulazione ogni NUM colonne\n" -" (predefinito 8)." +" (predefinito 8)" -#: src/sdiff.c:189 -#, fuzzy +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Minimizza il numero di differenze." +msgstr "-d, --minimal Minimizza il numero di differenze" -#: src/sdiff.c:190 -#, fuzzy +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H --speed-large-files Assume file grandi e tante piccole differenze." +"-H, --speed-large-files Assume file grandi e tante piccole differenze" -#: src/sdiff.c:191 -#, fuzzy +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" -msgstr "--diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file." +msgstr "--diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Considera tutti i file come testo." +msgstr " --help Mostra questo aiuto ed esce" -#: src/sdiff.c:194 -#, fuzzy +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" -msgstr "-v --version Stampa le informazioni sulla versione." +msgstr "" +"-v, --version Stampa le informazioni sulla versione ed esce" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Uso: %s [OPZIONE]... FILE1 FILE2\n" -#: src/sdiff.c:205 -#, fuzzy +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Mostra le differenze fianco a fianco." +msgstr "Mostra le differenze tra FILE1 e FILE2 fianco a fianco." # Tobia Conforto: impossibile combinare in modo interattivo da standard input -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "impossibile combinare in modo interattivo con lo standard input" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "entrambi i file da confrontare sono directory" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1555,248 +1523,3 @@ msgstr "" "s:\tInclude silenziosamente le righe in comune.\n" "v:\tInclude prolissamente le righe in comune.\n" "q:\tEsce.\n" - -#~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" -#~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" - -# Lo strano allineamento della seconda riga è corretto. -#~ msgid "-s --quiet --silent Output nothing; yield exit status only." -#~ msgstr "" -#~ "-s --quiet --silent Non mostra niente; fornisce solo lo stato " -#~ "d'uscita." - -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Stampa le informazioni sulla versione." - -#~ msgid "--help Output this help." -#~ msgstr "--help Mostra questo aiuto." - -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Confronta tre file riga per riga." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignora differenze causate dall'espansione\n" -#~ " delle tabulazioni." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Ignora differenze nel numero di spazi." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignora tutti gli spazi." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines Ignora differenze in righe vuote." - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Elimina i ritorni a capo a fine riga in input." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Considera tutti i file come testo." - -#, fuzzy -#~ msgid "" -#~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " -#~ "context.\n" -#~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " -#~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" -#~ " -p --show-c-function Show which C function each change is in.\n" -#~ " -F RE --show-function-line=RE Show the most recent line matching RE." -#~ msgstr "" -#~ "-c -C NUM --context[=NUM] Mostra NUM righe (predefinito 3) di contesto\n" -#~ " copiato.\n" -#~ "-u -U NUM --unified[=NUM] Mostra NUM righe (predefinito 3) di contesto\n" -#~ " unificato.\n" -#~ " --label ETICHETTA Usa ETICHETTA invece del nome del file.\n" -#~ " -p --show-c-function Mostra in quale funzione C appare il " -#~ "cambiamento.\n" -#~ " -F ER --show-function-line=ER Mostra la più vicina riga che " -#~ "corrisponde\n" -#~ " all'espressione regolare ER." - -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Mostra uno script per ed." - -#~ msgid "" -#~ "-y --side-by-side Output in two columns.\n" -#~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" -#~ " --left-column Output only the left column of common lines.\n" -#~ " --suppress-common-lines Do not output common lines." -#~ msgstr "" -#~ "-y --side-by-side Mostra in due colonne.\n" -#~ " -W NUM --width=NUM Mostra al massimo NUM colonne (predefinito " -#~ "130).\n" -#~ " --left-column Mostra solo la colonna di sinistra per le " -#~ "righe\n" -#~ " in comune.\n" -#~ " --suppress-common-lines Non mostra le righe in comune." - -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t --expand-tabs Espande le tabulazioni in spazi nell'output." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Allinea le tabulazioni usando una tabulazione." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NUM Stop di tabulazione ogni NUM colonne\n" -#~ " (predefinito 8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Minimizza il numero di differenze." - -#~ msgid "" -#~ "--speed-large-files Assume large files and many scattered small changes." -#~ msgstr "" -#~ "--speed-large-files Assume file grandi e tante piccole differenze." - -# Questa opzione produce: -# -# diff3 -A file1 file2 file3 -# 2a -# ||||||| file2 -# Questo è il file 2. -# ======= -# Questo è il file 3. -# >>>>>>> file3 -# . -# 1a -# <<<<<<< file1 -# . -# -# Lo strano allineamento della seconda riga è corretto. -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Mostra tutte le differenze, tenendo separati\n" -#~ " i conflitti." - -# Questa opzione produce: -# -# diff3 -X file1 file2 file3 -# 2a -# ======= -# Questo è il file 3. -# >>>>>>> file3 -# . -# 1a -# <<<<<<< file1 -# . -# -# Lo strano allineamento della seconda riga è corretto. -#~ msgid "-X Output overlapping changes, bracketing them." -#~ msgstr "" -#~ "-X Mostra le differenze che si sovrappongono,\n" -#~ " tenendole separate." - -# Questa opzione produce: -# -# diff3 -m file1 file2 file3 -# Testo comune. -# <<<<<<< file1 -# Questo è il file 1. -# ||||||| file2 -# Questo è il file 2. -# ======= -# Questo è il file 3. -# >>>>>>> file3 -# Altro testo comune. -# -# Lo strano allineamento della seconda riga è corretto. -#~ msgid "-m --merge Output merged file instead of ed script (default -A)." -#~ msgstr "" -#~ "-m --merge Mostra le differenze in un file unico invece\n" -#~ " che in uno script per ed (predefinito -A)." - -#~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." -#~ msgstr "" -#~ "-L ETICHETTA --label=ETICHETTA Usa ETICHETTA invece del nome del file." - -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignora tutti gli spazi." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NUM --width=NUM Mostra al massimo NUM colonne (predefinito " -#~ "130)." - -# Lo strano allineamento della seconda riga è corretto. -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Mostra solo la colonna di sinistra per le " -#~ "righe\n" -#~ " in comune." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Assume file grandi e tante piccole differenze." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "lettura fallita" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "scrittura non riuscita" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "lettura fallita" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "lettura fallita" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "scrittura non riuscita" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "scrittura non riuscita" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Segnalare i bug a <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "l'opzione '-%ld' è obsoleta; usare '-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "l'opzione '-%ld' è obsoleta; rimuoverla" - -#~ msgid "subsidiary program `%s' not found" -#~ msgstr "programma accessorio '%s' non trovato" - -#~ msgid "subsidiary program `%s' failed" -#~ msgstr "programma accessorio '%s' non riuscito" - -#~ msgid "subsidiary program `%s' failed (exit status %d)" -#~ msgstr "programma accessorio '%s' non riuscito (stato d'uscita %d)" Binary files differ@@ -1,5 +1,5 @@ # Japanese GNU diffutils messages -# Copyright (C) 2000, 2010 Free Software Foundation, Inc. +# Copyright (C) 2000, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # IIDA Yosiaki <iida@gnu.org>, 2002. # Masahito Yamaga <yamaga@ipc.chiba-u.ac.jp>, 2002. @@ -7,13 +7,13 @@ # derived from the version by Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp> 1998. # Jun Nishii <jun@flatout.org> 1999. # Daisuke Yamashita <yamad@mb.infoweb.ne.jp> 1999. -# Yasuaki Taniguchi <yasuakit@gmail.com>, 2010. +# Yasuaki Taniguchi <yasuakit@gmail.com>, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: diffutils 3.0\n" +"Project-Id-Version: GNU diffutils 3.2\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2010-10-19 10:06+0900\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2011-09-08 14:13+0900\n" "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" "Language: ja\n" @@ -30,7 +30,7 @@ msgstr "プログラムエラー" msgid "stack overflow" msgstr "スタックオーバーフロー" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "不明なシステムエラー" @@ -44,7 +44,7 @@ msgstr "通常ファイル" #: lib/file-type.c:41 msgid "directory" -msgstr "ディレクトリ" +msgstr "ディレクトリー" #: lib/file-type.c:44 msgid "block special file" @@ -87,9 +87,9 @@ msgid "weird file" msgstr "不明なファイル" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: オプション '%s' は曖昧です\n" +msgstr "%s: オプション '%s' は曖昧です。次のものが可能です:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format @@ -143,100 +143,102 @@ msgstr "%s: オプション '-W %s' は引数が必要です\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "`" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "'" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "成功です" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "一致しません" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "無効な正規表現です" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "無効な照合文字です" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "無効な文字クラス名です" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "終端のバックスラッシュ" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "無効な前方参照です" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ または [^ が不一致です" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( または \\( が不一致です" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ が不一致です" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} の中身が無効です" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "無効な範囲終了です" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "メモリを使い果たしました" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "無効な前方正規表現です" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "正規表現が途中で終了しました" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "正規表現が大きすぎます" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") または \\) が不一致です" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "以前に正規表現がありません" @@ -266,18 +268,18 @@ msgid "failed to reopen %s with mode %s" msgstr "%s をモード %s で再度開くことに失敗しました" #: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid %s%s argument '%s'" msgstr "引数 `%3$s' に対して %1$s%2$s が無効です" #: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid suffix in %s%s argument '%s'" msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です" #: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument `%s' too large" +#, fuzzy, c-format +msgid "%s%s argument '%s' too large" msgstr "引数 `%3$s' に対する %1$s%2$s が大きすぎます" #: lib/version-etc.c:74 @@ -456,7 +458,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "GNU ソフトウェアを使用する際の一般的なヘルプ: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "ファイル %s と %s は異なります\n" @@ -464,9 +466,9 @@ msgstr "ファイル %s と %s は異なります\n" #: src/analyze.c:462 #, c-format msgid "Binary files %s and %s differ\n" -msgstr "バイナリファイル %s と%s は異なります\n" +msgstr "バイナリーファイル %s と%s は異なります\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "ファイル末尾に改行がありません" @@ -480,94 +482,93 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." -msgstr "「%s --help」で、より詳細な情報を調べてみてください。" +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." +msgstr "詳しくは`%s --help'を実行してください。" #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "無効な--ignore-initialの値「%s」" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" +msgstr "無効な --ignore-initial の値 `%s' です" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" -msgstr "オプション-lと-sは両立しません" +msgstr "オプション -l と -s は同時に指定できません" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" -msgstr "書込み失敗" +msgstr "書き込みに失敗しました" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "標準出力" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes 異なるバイトを表示。" +msgstr "-b, --print-bytes 異なるバイトを表示する" #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" -msgstr "-i SKIP --ignore-initial=SKIP 入力の先頭SKIPバイトをスキップ。" +msgstr "" +"-i, --ignore-initial=SKIP 両方の入力の先頭 SKIP バイトをスキップする" #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" -msgstr " FILE1のSKIP1バイトとFILE2のSKIP2バイトをスキップ。" +msgstr "" +"-i, --ignore-initial=SKIP1:SKIP2 FILE1 の先頭 SKIP1 バイトと FILE2 の先頭\n" +" SKIP2 バイトをスキップする" #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" -msgstr "-l --verbose すべての異なるバイトの指数と値を出力。" +msgstr "-l, --verbose バイト数および異なるバイトの値を出力する" #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n LIMIT --bytes=LIMIT 高々LIMITバイトを比較。" +msgstr "-n, --bytes=LIMIT 最大 LIMIT バイトを比較する" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent 通常の表示をすべて抑止する" #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help このメッセージを表示して終了する" #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version バージョン情報を出力。" +msgstr "-v, --version バージョン情報を表示して終了する" #: src/cmp.c:178 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" -msgstr "" -"使用法: %s [オプション]... ファイル1 [ファイル2 [スキップ1 [スキップ2]]]\n" +msgstr "使用法: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" #: src/cmp.c:180 msgid "Compare two files byte by byte." msgstr "2つのファイルをバイトごとに比較します。" #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." -msgstr "「スキップ1」と「スキップ2」は、各ファイルをスキップするバイト数。" +msgstr "" +"オプションの SKIP1 と SKIP2 はそれぞれのファイルの先頭からスキップする\n" +"バイト数を指定します(デフォルトは 0)。" -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"長い形式のオプションで必須の引数は、それに対応する短い形式のオプションでも同" +"様に必須です。\n" #: src/cmp.c:191 msgid "" @@ -575,34 +576,35 @@ msgid "" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." msgstr "" -"スキップの値には、次の係数を続けることもできます。\n" -"kB 1000、K 1024、MB 1,000,000、M 1,048,576、\n" -"GB 1,000,000,000、G 1,073,741,824、またT、P、E、Z、Yについても同様。" +"SKIP の値には次の倍数を表す接尾辞を付けることも出来ます:\n" +"kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" +"GB 1,000,000,000, G 1,073,741,824。また、 T, P, E, Z, Y も同様です。" #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "もしファイルがないか「-」のとき、標準入力を読みます。" +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." +msgstr "FILE が `-' または指定しない場合、標準入力から読み込みます。" -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "終了コードは、入力ファイルが同じ場合は 0、入力ファイルが異なる場合は 1、\n" "問題が発生したときは 2 になります。" #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" -msgstr "無効な--bytesの値「%s」" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" +msgstr "無効な --bytes の値 `%s' です。" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" -msgstr "「%s」の後のオペランドがありません" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" +msgstr "`%s' の後に被演算子がありません" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" -msgstr "余計なオペランド「%s」" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" +msgstr "余分な被演算子 `%s' です。" #: src/cmp.c:491 #, c-format @@ -617,323 +619,321 @@ msgstr "%s %s 異なります: バイト %s、行 %s %3o %s %3o %s\n" #: src/cmp.c:559 #, c-format msgid "cmp: EOF on %s\n" -msgstr "cmp: ファイル%sの末尾\n" +msgstr "cmp: %s でファイル終端 (EOF) に達しました\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" -msgstr "無効な前後の幅「%s」" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" +msgstr "無効な前後の行数 `%s' です" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "このホストではページ割付けをサポートしません" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "ファイル・ラベル・オプションが多すぎます" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" -msgstr "無効な幅「%s」" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" +msgstr "無効な幅 `%s' です" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" -msgstr "幅のオプションが衝突しています" +msgstr "幅のオプションが競合しています" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" -msgstr "無効な横幅「%s」" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" +msgstr "無効な横幅 `%s' です" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" -msgstr "無効なタブ幅「%s」" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" +msgstr "無効なタブ幅 `%s' です" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" -msgstr "タブ幅のオプションが衝突しています" +msgstr "タブ幅のオプションが競合しています" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" -msgstr "--from-fileと--to-fileの両方を指定しました" +msgstr "--from-file および --to-file の両方が指定されています" -#: src/diff.c:851 -#, fuzzy +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" -msgstr "--normal 標準的な差分を出力。" +msgstr " --normal 通常の diff を出力する (デフォルト)" -#: src/diff.c:852 -#, fuzzy +#: src/diff.c:855 msgid "-q, --brief report only when files differ" -msgstr "-q --brief ファイルが異なるかどうかだけを出力。" +msgstr "-q, --brief ファイルが異なるかどうかのみ表示する" -#: src/diff.c:853 -#, fuzzy +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" -msgstr "-s --report-identical-files 両ファイルが同じときに報告する。" +msgstr "" +"-s, --report-identical-files 両方のファイルが同一であるかどうかのみ表示する" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr "-w NUM --width=NUM 行当り高々NUM (既定は130) 桁で出力。" +msgstr "" +"-c, -C NUM, --context[=NUM] コンテキスト diff 形式で前後 NUM (デフォルト: " +"3) 行を表示する" -#: src/diff.c:855 -#, fuzzy +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" -msgstr "-w NUM --width=NUM 行当り高々NUM (既定は130) 桁で出力。" +msgstr "" +"-u, -U NUM, --unified[=NUM] ユニファイド diff 形式で前後 NUM (デフォルト: " +"3) 行を表示する" -#: src/diff.c:856 -#, fuzzy +#: src/diff.c:859 msgid "-e, --ed output an ed script" -msgstr "-a --text すべてテキストとして処理。" +msgstr "-e, --ed ed スクリプトを出力する" -#: src/diff.c:857 -#, fuzzy +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs RCS形式の差分を出力。" +msgstr "-n, --rcs RCS 形式の diff を出力する" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version バージョン情報を出力。" +msgstr "-y, --side-by-side 出力を2列にする" -#: src/diff.c:859 -#, fuzzy +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" -msgstr "-w NUM --width=NUM 行当り高々NUM (既定は130) 桁で出力。" +msgstr "" +"-W, --width=NUM 表示する列を最大 NUM (デフォルト: 130) 列にする" -#: src/diff.c:860 -#, fuzzy +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column 共通行は左列だけ出力。" +msgstr " --left-column 共通行は左側の列のみ表示する" -#: src/diff.c:861 -#, fuzzy +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines 共通行の出力を抑止。" +msgstr " --suppress-common-lines 共通行の出力を抑止する" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" -msgstr "" +msgstr "-p, --show-c-function 変更がある C 関数を表示する" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" -msgstr "" +msgstr "-F, --show-function-line=RE RE に一致する最も近い行を表示する" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" +" --label LABEL ファイル名の代わりに LABEL を使用する\n" +" (繰り返し指定できます)" -#: src/diff.c:868 -#, fuzzy +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs 出力のタブを空白に展開する。" +msgstr "-t, --expand-tabs 出力時にタブをスペースに展開する" -#: src/diff.c:869 -#, fuzzy +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" -msgstr "-T --initial-tab タブで始まる行は、前にタブを置いて揃える。" +msgstr "" +"-T, --initial-tab タブで始まる行は、前にタブを置いてそろえる" -#: src/diff.c:870 -#, fuzzy +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" -msgstr "--tabsize=NUM タブ幅を NUM (デフォルトは 8) 列に設定する。" +msgstr "" +" --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列に設定する" -#: src/diff.c:871 -#, fuzzy +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" -msgstr "--suppress-blank-empty 空の出力行でスペースまたはタブを抑止する。" +msgstr "" +" --suppress-blank-empty 空の出力行の前後ではスペースまたはタブを抑止す" +"る" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" -msgstr "-l --paginate 出力を `pr' でページ分割する。" +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "" +"-l, --paginate ページ割り付けを行うために `pr' を通して出力す" +"る" -#: src/diff.c:874 -#, fuzzy +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" -msgstr "-r --recursive 見つかった下位ディレクトリーを再帰的に比較する。" +msgstr "-r, --recursive サブディレクトリーを再帰的に比較する" -#: src/diff.c:875 -#, fuzzy +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file 存在しないファイルは空とみなす。" +msgstr "" +"-N, --new-file 存在しないファイルを空ファイルとして扱う" -#: src/diff.c:876 -#, fuzzy +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" -msgstr "--unidirectional-new-file 存在しない前者のファイルは空とみなす。" +msgstr "" +" --unidirectional-new-file 存在しない最初のファイルを空ファイルとして扱" +"う" -#: src/diff.c:877 -#, fuzzy +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" -msgstr "--ignore-file-name-case ファイル名の大文字小文字を無視。" +msgstr " --ignore-file-name-case ファイル名の大文字と小文字を区別しない" -#: src/diff.c:878 -#, fuzzy +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" -msgstr "--no-ignore-file-name-case ファイル名の大文字小文字を区別。" +msgstr " --no-ignore-file-name-case ファイル名の大文字と小文字を区別する" -#: src/diff.c:879 -#, fuzzy +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" -msgstr "-x PAT --exclude=PAT PATと一致するファイルを除外する。" +msgstr "-x, --exclude=PAT PAT に一致するファイルを除外する" -#: src/diff.c:880 -#, fuzzy +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X FILE --exclude-from=FILE FILE内の各パターンと一致するファイルを除外。" +"-X, --exclude-from=FILE FILE 内のパターンに一致するファイルを除外する" -#: src/diff.c:881 -#, fuzzy +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -"-S FILE --starting-file=FILE ディレクトリーを比較する際、FILEから始める。" +"-S, --starting-file=FILE ディレクトリーを比較する時に FILE から始める" -#: src/diff.c:882 -#, fuzzy +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=FILE1 全オペランドとFILE1を比較。FILE1はディレクトリーも可。" +" --from-file=FILE1 すべての被演算子と FILE1 を比較する\n" +" FILE1 はディレクトリーでもよい" -#: src/diff.c:884 -#, fuzzy +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=FILE2 FILE2と全オペランドを比較。FILE2はディレクトリーも可。" +" --to-file=FILE2 すべての被演算子を FILE2 を比較する\n" +" FILE2 はディレクトリーでもよい" -#: src/diff.c:887 -#, fuzzy +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" -msgstr "-i --ignore-case ファイル内容の大文字小文字を無視。" +msgstr "" +"-i, --ignore-case ファイル内容の比較時に大文字と小文字を区別し" +"ない" -#: src/diff.c:888 -#, fuzzy +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" -msgstr "-E --ignore-tab-expansion タブ展開の差を無視。" +msgstr "-E, --ignore-tab-expansion タブ展開によって発生する違いを無視する" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space 全空白を無視。" +msgstr "-Z, --ignore-trailing-space 行末にあるスペースを無視する" -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change 空白数の差を無視。" +msgstr "-b, --ignore-space-change スペース数により生じる違いを無視する" -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space 全空白を無視。" +msgstr "-w, --ignore-all-space すべてのスペースを無視する" -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines 空白だけの行の差を無視。" +"-B, --ignore-blank-lines ignore changes where lines are all blank" +msgstr "" +"-B, --ignore-blank-lines 空白類文字だけの行により生じる違いを無視する" -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" -msgstr "-i RE --ignore-matching-lines=RE REに一致するすべての行の差を無視。" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE RE と一致するすべての行の違いを無視する" -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:899 msgid "-a, --text treat all files as text" -msgstr "-a --text すべてテキストとして処理。" +msgstr "-a, --text すべてのファイルをテキストとして扱う" -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr 入力から行末キャリッジ・リターンを削除。" +msgstr "" +" --strip-trailing-cr 入力から CR (キャリッジリターン) を除去する" -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:902 msgid " --binary read and write data in binary mode" -msgstr "--binary バイナリー・モードで読み書き。" +msgstr " --binary バイナリーモードでデータを読み書きする" -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" -msgstr "-D NAME --ifdef=NAME 差分を「#ifdef NAME」で示す併合ファイルを出力。" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" +msgstr "" +"-D, --ifdef=NAME パッチ適用時に `#ifdef NAME' で併合されるよう" +"に差分を出力する" -#: src/diff.c:902 -#, fuzzy +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" -msgstr "--GTYPE-group-format=GFMT 同様だが、GTYPEの入力群をGFMTで整形。" +msgstr " --GTYPE-group-format=GFMT GTYPE の入力グループを GFMT で整形する" -#: src/diff.c:903 -#, fuzzy +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" -msgstr "--line-format=LFMT 同様だが、全入力行をLFMTで整形。" +msgstr " --line-format=LFMT すべての入力行を LFMT で整形する" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" -msgstr "--LTYPE-line-format=LFMT 同様だが、LTYPE入力行をLFMTで整形。" +msgstr " --LTYPE-line-format=LFMT LTYPE 入力行を LFMT で整形する" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +" これらの書式整形オプションは -D/--ifdef に適用される diff の出力をきれい" +"に\n" +" 見えるように制御するために提供されます。" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" ここでLTYPEは「old」「new」「unchanged」。GTYPEはLTYPEか「changed」。" +" LTYPE は `old'、`new'、または`unchanged'です。GTYPE は LTYPE または " +"`changed' です。" -#: src/diff.c:908 -#, fuzzy +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -948,33 +948,32 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -" GFMTには以下を指定できます:\n" -" %< FILE1の行\n" -" %> FILE2の行\n" -" %= FILE1とFILE2の共通行\n" -" %[-][WIDTH][.[PREC]]{doxX}LETTER printf風指定でのLETTER\n" -" LETTERは、以下の文字で新しい方、小文字で古い方:\n" +" GFMT でのみ指定できる書式:\n" +" %< FILE1 からの行\n" +" %> FILE2 からの行\n" +" %= FILE1 と FILE2 で共通の行\n" +" %[-][WIDTH][.[PREC]]{doxX}LETTER printf 書式の LETTER\n" +" LETTER は次の通りです。ただし古いグループでは小文字です:\n" " F 最初の行番号\n" " L 最後の行番号\n" " N 行数 = L-F+1\n" " E F-1\n" -" M L+1" +" M L+1\n" +" %(A=B?T:E) A と B が等しい場合は T、等しくない場合は E" -#: src/diff.c:920 -#, fuzzy +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -" LFMTには以下を指定できます:\n" -" %L 行内容\n" -" %l 後続する改行をのぞいた行内容\n" -" %[-][WIDTH][.[PREC]]{doxX}n printf風指定での入力行数" +" LFMT でのみ指定できる書式:\n" +" %L 行の内容\n" +" %l 行末にあるすべての種類の改行文字を除いた行の内容\n" +" %[-][WIDTH][.[PREC]]{doxX}n printf 書式の入力行" -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -982,98 +981,105 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -" GFMTやLFMTには以下を指定できます:\n" +" GFMT と LFMT の両方で指摘できる書式:\n" " %% %\n" -" %c'C' 文字C一文字\n" -" %c'\\OOO' 8進コードOOOの文字" +" %c'C' 単一文字 C\n" +" %c'\\OOO' 八進数コード OOO\n" +" C 文字 C (他の文字も同様に表す)" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal できるだけがんばって、小さい差分を見つける。" +msgstr "-d, --minimal 差分の大きさが最小となるように違いを検出する" -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" -msgstr "--horizon-lines=NUM 先頭と末尾にある共通なNUM行を確保。" +msgstr " --horizon-lines=NUM 差分の前後にある共通部分を NUM 行保持する" -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" -msgstr "-H --speed-large-files 巨大なファイルに分散した変更があると仮定。" +msgstr "" +" --speed-large-files 巨大なファイルに小さな差分が分散していると仮定する" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" -msgstr "" +msgstr " --help このヘルプを表示して終了する" -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:939 msgid "-v, --version output version information and exit" -msgstr "-v --version バージョン情報を出力。" +msgstr "-v, --version バージョン情報を表示して終了する" -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." -msgstr "FILESは、「FILE1 FILE2」「DIR1 DIR2」「DIR FILE...」「FILE... DIR」。" +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." +msgstr "" +"FILES は `FILE1 FILE2'、`DIR1 DIR2' 、`DIR FILE...'、または `FILE... DIR' で" +"す。" -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." -msgstr "--from-fileや--to-fileを指定すれば、FILESの制限はありません。" +msgstr "" +"--from-file または --to-file が与えられた場合、FILE に制限はありません。" -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "ファイルが「-」のとき、標準入力を読みます。" +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." +msgstr "FILE が `-' の場合、標準入力から読み込みます。" -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" -msgstr "使用法: %s [オプション]... FILES\n" +msgstr "使用法: %s [OPTION]... FILES\n" -#: src/diff.c:950 -#, fuzzy +#: src/diff.c:954 msgid "Compare FILES line by line." -msgstr "2つのファイルを行ごとに比較します。" +msgstr "FILES を行ごとに比較します。" -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" -msgstr "%sオプションの値「%s」が衝突しています" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" +msgstr "%s オプションの値 `%s' が競合しています" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" -msgstr "出力指定オプションが衝突しています" +msgstr "出力形式オプションが競合しています" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" -msgstr "%sだけに発見: %s\n" +msgstr "%s のみに存在: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "「-」はディレクトリーと比較できません" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" +msgstr "`-' とディレクトリーは比較できません" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" -msgstr "-Dオプションはディレクトリーでのサポートをしていません" +msgstr "-D オプションはディレクトリーにはサポートされません" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" -msgstr "共通の下位ディレクトリー: %sと%s\n" +msgstr "共通のサブディレクトリー: %s と %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" -msgstr "ファイル%sは%s、ファイル%sは%s\n" +msgstr "ファイル %s は %s です。一方、ファイル %s は %s です\n" + +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "ファイル %s と %s は異なります\n" -#: src/diff.c:1335 +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" -msgstr "ファイル%sと%sは同一\n" +msgstr "ファイル %s と %s は同一です\n" #. This is a proper name. See the gettext manual, section Names. #: src/diff3.c:41 @@ -1083,103 +1089,104 @@ msgstr "Randy Smith" #: src/diff3.c:313 #, c-format msgid "incompatible options" -msgstr "両立しないオプション" +msgstr "同時に指定できないオプションです" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "入力ファイルに「-」が複数回指定されました" +#, fuzzy +msgid "'-' specified for more than one input file" +msgstr "入力ファイルとして `-' が複数回指定されています" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" -msgstr "読込み失敗" +msgstr "読み込みに失敗しました" #: src/diff3.c:428 -#, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" -msgstr "-A --show-all 衝突をくくり、全変更を出力。" +msgstr "" +"-A, --show-all 競合をすべて括弧でくくり、変更をすべて出力する" #: src/diff3.c:430 -#, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" -msgstr "-e --ed OLDFILEからYOURFILEへのMYFILEにたいする未併合の変更を出力。" +msgstr "" +"-e, --ed OLDFILE、YOURFILE、MYFILE の間の違いを ed\n" +" スクリプトとして出力する\n" +" " #: src/diff3.c:432 -#, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" -msgstr "-E --show-overlap 衝突をくくり、未併合の変更を出力。" +msgstr "-E, --show-overlap -e と同様だが、競合を括弧でくくる" #: src/diff3.c:433 -#, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" -msgstr "-3 --easy-only 衝突していない、未併合の変更を出力。" +msgstr "" +"-3, --easy-only -e と同様だが、3ファイル競合で無い部分のみ出力す" +"る" #: src/diff3.c:434 -#, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only 重複した変更を出力。" +msgstr "" +"-x, --overlap-only -e と同様だが、3ファイル競合の部分のみ出力する" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap 衝突をくくり、未併合の変更を出力。" +msgstr "-X -x と同様だが、競合を括弧でくくる" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i edスクリプトの後に「w」と「q」コマンドを追加。" +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "" +"-i ed スクリプトの後に `w' と `q' コマンドを追加する" #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge 他のオプションを指定していない場合、-A 従って\n" +" 実際に併合されたファイルを出力する" #: src/diff3.c:441 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text すべてテキストとして処理。" +msgstr "-a, --text すべてのファイルをテキストとして扱う" #: src/diff3.c:442 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr 入力から行末キャリッジ・リターンを削除。" +msgstr " --strip-trailing-cr 入力から末尾のキャリッジリターンを除去する" #: src/diff3.c:443 -#, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" -msgstr "-T --initial-tab タブで始まる行は、前にタブを置いて揃える。" +msgstr "-T, --initial-tab タブで始まる行は、前にタブを置いてそろえる" #: src/diff3.c:444 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" -msgstr "--diff-program=PROGRAM ファイルの比較にPROGRAMを使用。" +msgstr " --diff-program=PROGRAM ファイル比較に PROGRAM を使用する" #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=LABEL ファイル名の代わりに LABEL を使用する\n" +" (3回まで繰り返し指定できる)" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text すべてテキストとして処理。" +msgstr " --help このヘルプを表示して終了する" #: src/diff3.c:449 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version バージョン情報を出力。" +msgstr "-v, --version バージョン情報を表示して終了する" #: src/diff3.c:458 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -msgstr "使用法: %s [オプション]... MYFILE OLDFILE YOURFILE\n" +msgstr "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" #: src/diff3.c:460 msgid "Compare three files line by line." @@ -1198,6 +1205,15 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"デフォルトでは違いが人間にとって読みやすい出力形式です。\n" +"\n" +"-e、-E、-x、-X (およびその長い形式) オプションを指定した場合はデフォルト\n" +"の代わりに ed スクリプトを出力します。\n" +"\n" +"最後に、-m (--merge) オプションにより diff3 は内部で併合を行い、実際に\n" +"併合されたファイルを出力します。通常の入力としては、これは ed を使用す\n" +"るより強固です。\n" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." @@ -1207,178 +1223,170 @@ msgstr "" #: src/diff3.c:675 msgid "internal error: screwup in format of diff blocks" -msgstr "内部エラー: 差分ブロックの形式にハマる" +msgstr "内部エラー: 差分ブロックの形式をうまく処理できませんでした" #: src/diff3.c:968 #, c-format msgid "%s: diff failed: " -msgstr "%s: diff失敗: " +msgstr "%s: diff に失敗しました: " #: src/diff3.c:990 msgid "internal error: invalid diff type in process_diff" -msgstr "内部エラー: process_diff内で無効な差分型" +msgstr "内部エラー: process_diff 内に無効な差分型があります" #: src/diff3.c:1015 msgid "invalid diff format; invalid change separator" -msgstr "無効な差分形式; 無効な変更区切り" +msgstr "無効な差分形式です。無効な変更区切りです" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" -msgstr "無効な差分形式; 最終行が未終端" +msgstr "無効な差分形式です。最後の行が不完全です" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "下位プログラム `%s' が起動できません" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" -msgstr "無効な差分形式; 不正な行頭文字群" +msgstr "無効な差分形式です。行の先頭文字が誤っています" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" -msgstr "内部エラー: 出力に渡される無効な差分型" +msgstr "内部エラー: 無効な差分型が出力に渡されました" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" -msgstr "入力ファイルが縮んだ" +msgstr "入力ファイルが小さくなりました" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "ファイル名「%s」と「%s」を比較できません" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" +msgstr "ファイル `%s' と `%s' を比較できません" #: src/dir.c:209 #, c-format msgid "%s: recursive directory loop" -msgstr "%s: 再帰的なディレクトリループです" +msgstr "%s: ディレクトリーが再帰的にループしています" #. This is a proper name. See the gettext manual, section Names. #: src/sdiff.c:42 msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 -#, fuzzy +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" -msgstr "-o FILE --output=FILE 対話的に操作し、出力はFILEへ。" +msgstr "-o, --output=FILE 対話的に操作し、出力を FILE に送る" -#: src/sdiff.c:172 -#, fuzzy +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" -msgstr "-i --ignore-case ファイル内容の大文字小文字を同一視。" +msgstr "-i, --ignore-case 大文字と小文字を区別しない" -#: src/sdiff.c:173 -#, fuzzy +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" -msgstr "-E --ignore-tab-expansion タブ展開の差を無視。" +msgstr "-E, --ignore-tab-expansion タブ展開によって発生する違いを無視する" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space 全空白を無視。" +msgstr "-Z, --ignore-trailing-space 行末にあるスペースを無視する" -#: src/sdiff.c:175 -#, fuzzy +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change 空白数の差を無視。" +msgstr "-b, --ignore-space-change スペース数により生じる違いを無視する" -#: src/sdiff.c:176 -#, fuzzy +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space 全空白を無視。" +msgstr "-W, --ignore-all-space すべてのスペースを無視する" -#: src/sdiff.c:177 -#, fuzzy +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines 空白だけの行の差を無視。" +msgstr "" +"-B, --ignore-blank-lines 空白類文字だけの行により生じる違いを無視する" -#: src/sdiff.c:179 +#: src/sdiff.c:181 #, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE RE と一致するすべての行の違いを無視する" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr 入力から行末キャリッジ・リターンを削除。" +msgstr "" +" --strip-trailing-cr 入力から末尾のキャリッジリターンを除去する" -#: src/sdiff.c:180 -#, fuzzy +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" -msgstr "-a --text すべてテキストとして処理。" +msgstr "-a, --text すべてのファイルをテキストとして扱う" -#: src/sdiff.c:182 -#, fuzzy +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" -msgstr "-w NUM --width=NUM 行当り高々NUM (既定は130) 桁で出力。" +msgstr "" +"-w, --width=NUM 表示する列を最大 NUM (デフォルト: 130) 列にする" -#: src/sdiff.c:183 -#, fuzzy +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column 共通行は左列だけ出力。" +msgstr "-l, --left-column 共通行は左側の列のみ表示する" -#: src/sdiff.c:184 -#, fuzzy +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines 共通行の出力を抑止。" +msgstr "-s, --suppress-common-lines 共通行の出力を抑止する" -#: src/sdiff.c:186 -#, fuzzy +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs 出力のタブを空白に展開する。" +msgstr "-t, --expand-tabs 出力時にタブをスペースに展開する" -#: src/sdiff.c:187 -#, fuzzy +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" -msgstr "--tabsize=NUM タブ幅を NUM (デフォルトは 8) 列に設定する。" +msgstr " --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列に設定する" -#: src/sdiff.c:189 -#, fuzzy +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal できるだけがんばって、小さい差分を見つける。" +msgstr "" +"-d, --minimal 差分の大きさが最小となるように違いを検出する" -#: src/sdiff.c:190 -#, fuzzy +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" -msgstr "-H --speed-large-files 巨大なファイルに分散した変更があると仮定。" +msgstr "" +"-H, --speed-large-files 巨大なファイルに小さな差分が分散していると仮定す" +"る" -#: src/sdiff.c:191 -#, fuzzy +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" -msgstr "--diff-program=PROGRAM ファイルの比較にPROGRAMを使用。" +msgstr " --diff-program=PROGRAM ファイル比較に PROGRAM を使用する" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text すべてテキストとして処理。" +msgstr " --help このヘルプを表示して終了する" -#: src/sdiff.c:194 -#, fuzzy +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" -msgstr "-v --version バージョン情報を出力。" +msgstr "-v, --version バージョン情報を表示して終了する" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "使用法: %s [OPTION]... FILE1 FILE2\n" -#: src/sdiff.c:205 -#, fuzzy +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "ファイル差分の2段組併合" +msgstr "FILE1 と FILE2 の差分を2段組で比較しながら併合します。" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "標準出力は対話的に併合できません" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" -msgstr "比較対象は両方ともディレクトリ" +msgstr "比較対象は両方ともディレクトリーです" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1391,16 +1399,16 @@ msgid "" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr "" -"ed:\t両方の版にヘッダーで飾って、利用し、編集。\n" -"eb:\t両側の版を使用して編集。\n" -"el:\t左側の版を使用して編集。\n" -"er:\t右側の版を使用して編集。\n" -"e:\t新版を編集。\n" -"l:\t左側の版を使用。\n" -"r:\t右側の版を使用。\n" -"s:\t共通行を寡黙に含む。\n" -"v:\t共通行を饒舌に含む。\n" -"q:\t終了。\n" +"ed: 両方にヘッダーを付加し、両方の版を編集して使用する。\n" +"eb: 両方の版を編集して使用する。\n" +"el または e1: 左側の版を編集して使用する。\n" +"er または e2: 右側の版を編集して使用する。\n" +"e: 両方の版を破棄し、新規行を編集する。\n" +"l または 1: 左側の版を使用する。\n" +"r または 2: 右側の版を使用する。\n" +"s: 共通行を暗黙的に含める。\n" +"v: 共通行を明示して含める。\n" +"q: 終了する。\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" @@ -1408,49 +1416,15 @@ msgstr "" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent 出力なし。終了ステータスのみ。" -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version バージョン情報を出力。" - #~ msgid "--help Output this help." #~ msgstr "--help この説明を出力。" -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "3つのファイルを行ごとに比較します。" - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion タブ展開の差を無視。" - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change 空白数の差を無視。" - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space 全空白を無視。" - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines 空白だけの行の差を無視。" - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr 入力から行末キャリッジ・リターンを削除。" - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text すべてテキストとして処理。" - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1460,10 +1434,6 @@ msgstr "" #~ " -p --show-c-function 各変更を含むCの関数名を表示。\n" #~ " -F RE --show-function-line=RE REと一致する直近の行を表示。" -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed edスクリプトを出力。" - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1475,30 +1445,10 @@ msgstr "" #~ " --left-column 共通行は左列だけ出力。\n" #~ " --suppress-common-lines 共通行の出力を抑止。" -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs 出力のタブを空白に展開する。" - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab タブで始まる行は、前にタブを置いて揃える。" - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=NUM タブ幅を NUM (デフォルトは 8) 列に設定する。" - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal できるだけがんばって、小さい差分を見つける。" - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "--speed-large-files 巨大なファイルに分散した変更があると仮定。" -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all 衝突をくくり、全変更を出力。" - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X 衝突をくくりながら、変更を出力。" @@ -1508,49 +1458,3 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L LABEL --label=LABEL ファイル名の代わりにLABELを使用。" - -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAM ファイルの比較にPROGRAMを使用。" - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space 全空白を無視。" - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "-w NUM --width=NUM 行当り高々NUM (既定は130) 桁で出力。" - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column 共通行は左列だけ出力。" - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "--speed-large-files 巨大なファイルに分散した変更があると仮定。" - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "読込み失敗" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "書込み失敗" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "読込み失敗" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "読込み失敗" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "書込み失敗" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "書込み失敗" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils-3.0\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2010-07-07 11:28+0100\n" "Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n" "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n" @@ -26,7 +26,7 @@ msgstr "programmas kļūda" msgid "stack overflow" msgstr "steka pārplūšana" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Nezināma sistēmas kļūda" @@ -139,100 +139,102 @@ msgstr "%s: opcijai \"-W %s\" nepieciešams arguments\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "\"" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "\"" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Veiksmīgi" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nav sakritību" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Nederīga regulārā izteiksme" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Nederīga salīdzināmā rakstzīme" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nederīgs rakstzīmju klases nosaukums" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Atkārtojošās otrādās slīpsvītras" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Nederīga aizmugures atsauce" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Nesakrītošs [ vao [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Nesakrītošs ( vai \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Nesakrītošs \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Nederīgs saturs iekš \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Nederīgas apgabala beigas" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Izskausta atmiņa" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Nederīga iepriekšējā regulārā izteiksme" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Priekšlaicīgas beigas regulārai izteiksmei" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Pārāk liela regulārā izteiksme" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Nesakrītošs ) vai \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nav iepriekšējas regulārās izteiksmes" @@ -262,18 +264,18 @@ msgid "failed to reopen %s with mode %s" msgstr "neizdevās atkārtoti atvērt %s režīmā %s" #: lib/xstrtol-error.c:63 -#, c-format -msgid "invalid %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid %s%s argument '%s'" msgstr "nederīgs %s%s arguments \"%s\"" #: lib/xstrtol-error.c:68 -#, c-format -msgid "invalid suffix in %s%s argument `%s'" +#, fuzzy, c-format +msgid "invalid suffix in %s%s argument '%s'" msgstr "nederīgs piedēklis iekš %s%s argumenta \"%s\"" #: lib/xstrtol-error.c:72 -#, c-format -msgid "%s%s argument `%s' too large" +#, fuzzy, c-format +msgid "%s%s argument '%s' too large" msgstr "%s%s arguments \"%s\" ir pārak liels" #: lib/version-etc.c:74 @@ -451,7 +453,7 @@ msgstr "" "Vispārēja palīdzība izmantojot GNU programmatūru: <http://www.gnu.org/" "gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Faili %s un %s atšķiras\n" @@ -461,7 +463,7 @@ msgstr "Faili %s un %s atšķiras\n" msgid "Binary files %s and %s differ\n" msgstr "Binārie faili %s un %s atšķiras\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Nav jaunu rindu faila beigās" @@ -475,14 +477,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Mēģiniet \"%s --help\" , lai iegūtu vairāk informācijas." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "nederīga --ignore-initial vērtība \"%s\"" #: src/cmp.c:147 @@ -490,14 +492,14 @@ msgstr "nederīga --ignore-initial vērtība \"%s\"" msgid "options -l and -s are incompatible" msgstr "opcijas -l un -s nav savstarpēji saderīgas" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "rakstīšana neizdevās" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standarta izvads" @@ -563,7 +565,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "IZLAIST1 un IZLAIST2 ir cipari, cik baitus izlaist katrā failā." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -579,28 +581,29 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, un tā tālāk T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Ja FAILAM ir \"-\" vai trūkst, tad lasīt standarta ievadu." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Izejas stāvoklis ir 0, ja ievads ir tāds pats, 1 ja tas ir atšķirīgs, 2 ja " "ir neptikšanas." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "nederīga --bytes vērtība \"%s\"" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "trūkst operands pēc \"%s\"" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "papildus operands \"%s\"" #: src/cmp.c:491 @@ -619,96 +622,93 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF uz %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "nederīgs konteksta garums \"%s\"" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "lapošana netiek atbalstīta uz šī resursdatora" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "pārāk daudz faila etiķešu opciju" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "nederīgs platums \"%s\"" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "konfliktējošas platuma opcijas" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "nederīgs horizontālais garums \"%s\"" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "nederīgs tabulācijas izmērs \"%s\"" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "konfliktējošas tabulācijas izmēru opcijas" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file un --to-file abi norādīti" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Izvada parastu diff." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Izvadit tikai, ja faili atšķiras." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Ziņot, kad divi faili ir vienādi." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NUMURS --width=NUMURS Izvada līdz NUMURAM (noklusētais 130) drukas " -"kolonas." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" @@ -716,22 +716,21 @@ msgstr "" "-w NUMURS --width=NUMURS Izvada līdz NUMURAM (noklusētais 130) drukas " "kolonas." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Izturēties pret visiem failiem, kā teksta." +msgstr "-e --ed Izvada ed skriptā." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Izvada RCS diff formātā." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Izvada versijas informāciju." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" @@ -739,42 +738,42 @@ msgstr "" "-w NUMURS --width=NUMURS Izvada līdz NUMURAM (noklusētais 130) drukas " "kolonas." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Izvadīt tikai kreiso kolonu no kopējām rindām." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Neizvadīt kopējās rindas." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Izplest tabulācijas atstarpi izvadā." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Pacelt tabulācijas rindu pirm tabulācijas." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" @@ -782,7 +781,7 @@ msgstr "" "--tabsize=NUMURS Tabulāciju apstāšanāss ir katru NUMURU (noklusētais ir 8) " "drukas kolonas." -#: src/diff.c:871 +#: src/diff.c:874 #, fuzzy msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" @@ -790,48 +789,52 @@ msgstr "" "--suppress-blank-empty Apspiest atstarpes vai tabulācijas pirms tukšam " "izvades rindām." -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Izlaist izvadu caur \"pr\", lai lapotu to." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Rekursīvā salīdzināšana jebkurai atrastai apakšdirektorijai." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Izturēties pret trūkstošiem faili, kā tukšiem failiem." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Izturēties pret trūkstošiem failiem kā tukšiem." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Ignorēt reģistru, kad salīdzina faila nosaukumus." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Neignorēt reģistru kad salīdzina faila " "nosaukumus." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Izslēgt failus, kuri atbilst PAT." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -839,14 +842,14 @@ msgstr "" "-X FAILS --exclude-from=FAILS Izslēgt failus, kuri atbilst jebkuram " "paternam FAILĀ." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S FAILS --starting-file=FAILS Sākt ar FAILU, kad salīdzina direktorijas." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -855,7 +858,7 @@ msgstr "" "--from-file=FAILS1 Salīdzini FAILU1 ar visiem operandiem. FAILS1 nevar būt " "direktorija." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -864,100 +867,101 @@ msgstr "" "--to-file=FAILS2 Salīdzini visus operandus ar FAILU2. FAILS2 nevar būt " "direktorija." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Ignorē reģistra atšķirības faila saturā." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignorēt izmaiņas, dēļ tabulācijas izplešanās." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignorēt visas atstarpes." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignorēt izmaiņas, dēļ atstarpēm." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignorēt visas atstarpes." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Ignorēt izmaiņas rindās, kur viss ir tukšs." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Ignorēt izmaiņas rindās, kuras sakrīt ar " "RE." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Izturēties pret visiem failiem, kā teksta." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Noņemt atkārtojošo rakstatgrieze ievadā." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Lasīt un rakstīt datus binārajā režīmā." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NOSAUKUMS --ifdef=NOSAUKUMS Izvads sapludināts failā, lai rāda \"#ifdef " "NOSAUKUMS\" diffs." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Līdzigs, bet formāts GTYPE ievades grupām ar GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT Līdzīgs, bet formāts visam ievades rindām ar LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Līdzīgs, bet formāts LTYPE ievades rindām ir LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE ir \"old\", \"new\", vai \"unchanged\". GTYPE ir LTYPE vai \"changed" "\"." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -985,7 +989,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -999,7 +1003,7 @@ msgstr "" " %[-][PLATUMS][.[PREC]]{doxX}n printf-style specifikācija ievades rindu " "numuriem" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1013,19 +1017,19 @@ msgstr "" " %c'C' vienu rakstzīmi C\n" " %c'\\OOO' rakstzīmi ar oktālo kodu OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Mēģināt smagi atrast pašas mazākas izmaiņu kopas." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=SKAITS Uzturēt SKAITU līniju kopējiem prefiksiem un " "sufiksiem." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1033,77 +1037,85 @@ msgstr "" "-H --speed-large-files Pieņemt, ka faili ir lieli un satur daudzas mazas " "izmaiņas." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Izvada versijas informāciju." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FAILI ir \"FAILS1 FAILS2\" vai \"DIREKTORIJA1 DIREKTORIJA2\" vai " "\"DIREKTORIJA FAILS...\" vai \"FAILS... DIREKTORIJA\"." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Ja --from-file vai --to-file ir dots, nav nekādu ierobežojumu uz FAILIEM." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Ja FAILS ir \"-\", lasīt standarta ievadu" -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Izmantošana: %s [OPCIJAS]... FAILI\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Salīdzina failu rindu pa rindai" -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "konfliktējoša %s opcijas vērtība \"%s\"" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "konfliktējoša izvades stila opcijas" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Tikai iekš %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "nevar salīdzināt \"-\" ar direktoriju" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D opcija netik atbalstīta ar direktorijām" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Kopējās apakšdirektorijas: %s un %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Fails %s ir %s kamēr fails %s ir %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Faili %s un %s atšķiras\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Fails %s un %s ir identiski\n" @@ -1119,11 +1131,12 @@ msgid "incompatible options" msgstr "savstarpēji nesaderīgas opcijas" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "\"-\" norādīts vairāk par vienu ievades failu" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lasīšana neizdevās" @@ -1162,15 +1175,12 @@ msgid "" msgstr "-x --overlap-only Izvada pārklājušas izmaiņas." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Izvada nesapludinātās izmaiņas, ieliekot iekavās " -"konfliktus." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Apvienot `w' un `q' komandas ed skriptā." #: src/diff3.c:438 @@ -1207,9 +1217,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Izturēties pret visiem failiem, kā teksta." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1262,30 +1271,30 @@ msgstr "iekšējā kļūda: nederīgs diff veids iekš process_diff" msgid "invalid diff format; invalid change separator" msgstr "nederīgs diff formāts; nederīgs izmaiņu atdalītājs" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "nederīgs diff formāts; nepilnīga pēdējā rindiņa" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "nevarēja izsaukt palīgprogrammu \"%s\"" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "nederīgs diff formāts; nederīgas rindas ievades rakstzīmes" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "iekšējā kļūda: nederīgs uz izvadu padotais diff veids" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "ievades fails saruka" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "nevar salīdzināt faila nosaukumus \"%s\" un \"%s\"" #: src/dir.c:209 @@ -1298,14 +1307,14 @@ msgstr "%s: rekrusīvs direktorijas cikls" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o FAILS --output=FAILS Darboties interaktīvi, izvadot izvadu uz FAILU." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" @@ -1313,44 +1322,51 @@ msgstr "" "-i --ignore-case Uzskatīt ka augšējais un apkšējais reģistrs ir viens un " "tas pats." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignorēt izmaiņas, dēļ tabulācijas izplešanās." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignorēt visas atstarpes." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignorēt izmaiņas, dēļ atstarpēm." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignorēt visas atstarpes." +msgstr "-W --ignore-all-space Ignorēt visas atstarpes." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Ignorēt izmaiņas rindās, kur viss ir tukšs." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE Ignorēt izmaiņas rindās, kuras sakrīt ar " +"RE." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Noņemt atkārtojošo rakstatgrieze ievadā." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Izturēties pret visiem failiem, kā teksta." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" @@ -1358,23 +1374,23 @@ msgstr "" "-w NUMURS --width=NUMURS Izvada līdz NUMURAM (noklusētais 130) drukas " "kolonas." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Izvadīt tikai kreiso kolonu no kopējām rindām." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Neizvadīt kopējās rindas." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Izplest tabulācijas atstarpi izvadā." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" @@ -1382,12 +1398,12 @@ msgstr "" "--tabsize=NUMURS Tabulāciju apstāšanāss ir katru NUMURU (noklusētais ir 8) " "drukas kolonas." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Mēģināt smagi atrast pašas mazākas izmaiņu kopas." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1395,41 +1411,40 @@ msgstr "" "-H --speed-large-files Pieņemt, ka faili ir lieli un satur daudzas mazas " "izmaiņas." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" "--diff-program=PROGRAMMA Izmantot PROGRAMMU, lai salīdzinātu divus failus." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Izturēties pret visiem failiem, kā teksta." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Izvada versijas informāciju." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Izmantošana: %s [OPCIJAS]... FAILS1 FAILS2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Plecu-pie-pleca failu atšķirību sapludināšana" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "nevar interaktīvi sapludināt standarta ievadu" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "abi salīdzināmie faili ir direktorijas" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1459,51 +1474,15 @@ msgstr "" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent Izvada neko, izdod tikai izejas stāvokli." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Izvada versijas informāciju." - #~ msgid "--help Output this help." #~ msgstr "--help Izvada šo palīdzību." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Salīdzināt trīs failus rindiņu pa rindiņai." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignorēt izmaiņas, dēļ tabulācijas izplešanās." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Ignorēt izmaiņas, dēļ atstarpēm." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorēt visas atstarpes." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Ignorēt izmaiņas rindās, kur viss ir tukšs." - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Noņemt atkārtojošo rakstatgrieze ievadā." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Izturēties pret visiem failiem, kā teksta." - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1515,10 +1494,6 @@ msgstr "" #~ " -p --show-c-function Rāda C funkcijas, kurās ir izmaiņas.\n" #~ " -F RE --show-function-line=RE Rāda nesenāko skarītošo RE rindu." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Izvada ed skriptā." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1530,34 +1505,12 @@ msgstr "" #~ " --left-column Izvada tikai kreisās kolonas no kopējām rindām.\n" #~ " --suppress-common-lines Neizvada kopējās rindas." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Izplest tabulācijas atstarpi izvadā." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Pacelt tabulācijas rindu pirm tabulācijas." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NUMURS Tabulāciju apstāšanāss ir katru NUMURU (noklusētais ir " -#~ "8) drukas kolonas." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Mēģināt smagi atrast pašas mazākas izmaiņu kopas." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Pieņemt, ka faili ir lieli un satur daudzas mazas " #~ "izmaiņas." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Izvada visas izmaņas, ieliekot iekavās konfliktus." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Izvada pārklājušas izmaiņas, ieliekot iekavās tās." @@ -1570,58 +1523,6 @@ msgstr "" #~ msgstr "" #~ "-L ETIĶETE --label=ETIĶETE Izmantot ETIĶETI nevis faila nosaukumu." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=PROGRAMMA Izmantot PROGRAMMU, lai salīdzinātu divus " -#~ "failus." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorēt visas atstarpes." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NUMURS --width=NUMURS Izvada līdz NUMURAM (noklusētais 130) drukas " -#~ "kolonas." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Izvadīt tikai kreiso kolonu no kopējām rindām." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Pieņemt, ka faili ir lieli un satur daudzas mazas " -#~ "izmaiņas." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "lasīšana neizdevās" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "rakstīšana neizdevās" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "lasīšana neizdevās" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "lasīšana neizdevās" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "rakstīšana neizdevās" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "rakstīšana neizdevās" - #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: neatļauta opcija -- %c\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2005-03-29 19:43+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n" "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n" @@ -25,7 +25,7 @@ msgstr "ralat program" msgid "stack overflow" msgstr "stack melimpah" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Ralat sistem tidak diketahui" @@ -138,100 +138,102 @@ msgstr "%s: pilihan `%s' memerlukan hujah\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Berjaya" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Tiada padanan" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Regular expression tidak sah" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Aksara pengumpulsemakan tidak sah" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nama kelas aksara tidak sah" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Slash dibelakang" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Rujukan belakang tidak sah" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ atau [^ tidak sepadan" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( atau \\( tidak sepadan" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ tidak sepadan" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Kandungan \\{\\} tidak sah" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Julat akhir tidak sah" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Kehabisan memori" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Regular expression awalan tidak sah" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Regular expression tamat tiba-tiba" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Regular expression terlalu besar" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") atau \\) tidak sepadan" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Tiada regular expression terdahulu" @@ -263,17 +265,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "nilai --bytes `%s' tidak sah" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "panjang horizon `%s' tidak sah" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -441,7 +443,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Fail %s dan %s berbeza\n" @@ -451,7 +453,7 @@ msgstr "Fail %s dan %s berbeza\n" msgid "Binary files %s and %s differ\n" msgstr "Fail %s dan %s berbeza\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Tiada baris baru pada penghujung fail" @@ -465,14 +467,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Cuba `%s --help' untuk maklumat lanjut." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "nilai `%s' --ignore-initial tidak sah" #: src/cmp.c:147 @@ -480,14 +482,14 @@ msgstr "nilai `%s' --ignore-initial tidak sah" msgid "options -l and -s are incompatible" msgstr "pilihan -l dan -s tidak sepadan" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "gagal menulis" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "keluaran piawai" @@ -552,7 +554,7 @@ msgid "" msgstr "" "LANGKAU1 dan LANGKAU2 adalah jumlah byte untuk dilangkau dalam setiap fail." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -568,28 +570,29 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, dan seterusnya untuk T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Jika FAIL adalah `-' atau tiada, baca masukan piawai." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status keluar adalah 0 jika masukan adalah sama, 1 jika berbeza, 2 jika " "bermasalah." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "nilai --bytes `%s' tidak sah" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "operan hilang selepas `%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "operan tambahan `%s'" #: src/cmp.c:491 @@ -608,208 +611,209 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF pada %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "panjang konteks `%s' tidak sah" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "pagination tidak disokong pada hos ini" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "terlalu banyak pilihan label fail" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "lebar `%s' tidak sah" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "pilihan lebar berkonflik" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "panjang horizon `%s' tidak sah" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "saiz tab `%s' tidak sah" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "pilihan saiz tab berkonflik" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "--from-file dan --to-file kedua-duanya dinyatakan" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Keluarkan diff normal." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Keluaran hanya jika fail berbeza." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Lapor apabila dua fail adalah sama." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur cetakan." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur cetakan." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Layan semua fail sebagai teks." +msgstr "-e --ed Keluarkan skrip ed." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Keluarkan diff format RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Keluarkan maklumat versi." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur cetakan." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Keluarkan hanya lajur kiri baris yang sama." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Jangan keluarkan baris sama." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Kembang tab kepada ruang dalam keluaran." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Jadikan tab sebaris dengan menambah awalan tab." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NOM Hentian tab setial NOM (default 8) lajur cetakan." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Salur keluaran menerusi `pr' untuk paginate." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Banding berulang-ulang sebarang subdirektori yang dijumpai." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Anggap fail tidak wujud sebagai kosong." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Anggap fail tidak wujud sebagai kosong." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Abai case apabila membanding nama fail." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Ambil kira case ketika membanding nama fail." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Asing fail yang sepadan PAT." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -817,14 +821,14 @@ msgstr "" "-X FAIL --exclude-from=FAIL Asing fail yang sepadan sebarang corak dalam " "FAIL." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S FAIL --starting-file=FAIL Mula dengan FAIL apabila membanding direktori." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -833,7 +837,7 @@ msgstr "" "--from-file=FAIL1 Banding FAIL1 kepada semua operan. FAIL1 boleh jadi " "direktori." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -842,106 +846,107 @@ msgstr "" "--to-file=FAIL2 Banding semua operan kepada FAIL2. FAIL2 boleh jadi " "direktori." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Abai perbezaan case dalam kandungan fail." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Abai perubahan diakibatkan oleh pengembangan tab." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Abai semua ruang putih." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Abai perubahan dalam jumlah ruang putih." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Abai semua ruang putih." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines Abai perubahan dimana baris adalah kesemuanya " "kosong." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Abai perubahan dimana baris semua sepadan " "RE." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Layan semua fail sebagai teks." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Buang enter penghujung pada masukan." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Baca dan tulis data dalam mod binari." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NAMA --ifdef=NAMA Keluarkan fail tergabung untuk menunjukkan perbezaa " "`#ifdef NAMA'." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Hampir sama, tetapi format masukan GTYPE " "dikumpulkan dengan GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT Hampir sama, tetapi format semua baris masukan dengan " "LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Hampir sama, tetapi format baris masukan LTYPE " "dengan LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE adalah `old', `new', atau `unchanged'. GTYPE adalah LTYPE atau " "`changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -970,7 +975,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -983,7 +988,7 @@ msgstr "" " %l kandungan baris, tidak termasuk baris baru dipenghujung\n" " %[-][WIDTH][.[PREC]]{doxX}n spec gaya-printf untuk nombor baris masukan" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -997,17 +1002,17 @@ msgstr "" " %c'C' satu aksara C\n" " %c'\\OOO' aksara dengan kod oktal OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Cuba cari dengan tekun set perbezaan yang kecil." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NOM Pastikan NOM baris prefix dan suffix sama." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1015,76 +1020,84 @@ msgstr "" "-H --speed-large-files Anggap fail besar dan banyak perubahan kecil " "tersebar." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Keluarkan maklumat versi." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FAIL-FAIL adalah `FAIL1 FAIL2' atau `DIR1 DIR2' atau `DIR FAIL...' atau " "`FAIL... DIR'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Jika --from-file atau --to-file diberi, tiada sekatan pada FAIL." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Jika FAIL adalah `-', baca masukan piawai." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Penggunaan: %s [PILIHAN]... FAIL\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Banding fail setiap baris." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "nilai pilihan %s berkonflik `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "pilihan gaya keluaran berkonflik" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Hanya dalam %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "tidak dapat membandingkan `-' kepada direktori" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "pilihan -D tidak disokong dengan direktori" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirektori umum: %s dan %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Fail %s adalah %s manakala fail %s adalah %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Fail %s dan %s berbeza\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Fail %s dan %s adalah serupa\n" @@ -1100,11 +1113,12 @@ msgid "incompatible options" msgstr "pilihan tidak sepadan" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' dinyatakan untuk lebih daripada satu fail masukan" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "gagal membaca" @@ -1143,14 +1157,12 @@ msgid "" msgstr "-x --overlap-only Keluarkan perubahan bertindih." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Keluarkan perubahan tidak digabung, kurungkan konflik." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Tambah arahan `w' dan `q' kepada skrip ed." #: src/diff3.c:438 @@ -1186,9 +1198,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Layan semua fail sebagai teks." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1240,30 +1251,30 @@ msgstr "ralat dalaman: jenis diff tidak sah dalam process_diff" msgid "invalid diff format; invalid change separator" msgstr "format diff tidak sah; pengasing perbezaan tidak sah" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "format diff tidak sah; baris akhir tidak lengkap" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "program subsidiari `%s' tidak dapat dilaksanakan" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "format diff tidak sah; aksara awal baris tidak betul" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "ralat dalaman: jenis diff tidak sah diberikan kepada keluaran" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "fail masukan mengecil" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "tidak dapat membandingkan fail bernama `%s' dan `%s'" #: src/dir.c:209 @@ -1276,93 +1287,100 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o FAIL --output=FAIL Operasi secara interaktif, hantar keluaran ke FAIL." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Anggap huruf besar dan kecil sebagai sama." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Abai perubahan diakibatkan oleh pengembangan tab." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Abai semua ruang putih." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Abai perubahan dalam jumlah ruang putih." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Abai semua ruang putih." +msgstr "-W --ignore-all-space Abai semua ruang putih." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B --ignore-blank-lines Abai perubahan dimana baris adalah kesemuanya " "kosong." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE Abai perubahan dimana baris semua sepadan " +"RE." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Buang enter penghujung pada masukan." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Layan semua fail sebagai teks." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur cetakan." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Keluarkan hanya lajur kiri baris yang sama." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Jangan keluarkan baris sama." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Kembang tab kepada ruang dalam keluaran." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=NOM Hentian tab setial NOM (default 8) lajur cetakan." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Cuba cari dengan tekun set perbezaan yang kecil." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1370,40 +1388,39 @@ msgstr "" "-H --speed-large-files Anggap fail besar dan banyak perubahan kecil " "tersebar." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Layan semua fail sebagai teks." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Keluarkan maklumat versi." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Penggunaan: %s [PILIHAN]... FAIL1 FAIL2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Gabung bersebelahan perbezaaan fail." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "tidak dapat menggabung masukan piawai secara interaktif" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "kedua-dua fail yang akan dibanding adalah direktori" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1429,6 +1446,20 @@ msgstr "" "v:\tSertakan baris sama dengan berjela.\n" "q:\tKeluar.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: pilihan salah -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Ini adalah perisian bebas; lihat sumber untuk syarat menyalin. TIADA " +#~ "jaminan disediakan;\n" +#~ "tidak juga untuk KEBOLEHDAGANGAN atau KEUPAYAAN UNTUK SESUATU TUJUAN " +#~ "KHUSUS.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i LANGKAU1:LANGKAU2 --ignore-initial=LANGKAU1:LANGKAU2" @@ -1436,53 +1467,24 @@ msgstr "" #~ msgstr "" #~ "-s --quiet --silent Tiada keluaran; hasilkan status keluaran sahaja." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Keluarkan maklumat versi." - #~ msgid "--help Output this help." #~ msgstr "--help Keluarkan bantuan ini." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Banding tiga fail tiap-tiap baris." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Abai perubahan diakibatkan oleh pengembangan " -#~ "tab." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Abai perubahan dalam jumlah ruang putih." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Abai semua ruang putih." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines Abai perubahan dimana baris adalah kesemuanya " -#~ "kosong." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Lapor pepijat kepada <bug-gnu-utils@gnu.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Buang enter penghujung pada masukan." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "pilihan `-%ld' tidak lagi digunakan; guna `-%c %ld'" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Layan semua fail sebagai teks." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "pilihan `-%ld' tidak lagi digunakan; abaikannya" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1495,10 +1497,6 @@ msgstr "" #~ "perubahan.\n" #~ " -F RE --show-function-line=RE Papar baris terbaru sepadan RE." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Keluarkan skrip ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1511,32 +1509,12 @@ msgstr "" #~ " --left-column Keluarkan hanya lajur kiri pada baris sama.\n" #~ " --suppress-common-lines Jangan keluarkan baris sama." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Kembang tab kepada ruang dalam keluaran." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Jadikan tab sebaris dengan menambah awalan tab." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=NOM Hentian tab setial NOM (default 8) lajur cetakan." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Cuba cari dengan tekun set perbezaan yang kecil." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Anggap fail besar dan banyak perubahan kecil " #~ "tersebar." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Keluarkan semua perubahan, kurungkan konflik." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Keluarkan perubahan bertindih, kurungkan mereka." @@ -1548,79 +1526,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L LABEL --label=LABEL Guna LABEL selain daripada nama fail." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Abai semua ruang putih." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur " -#~ "cetakan." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Keluarkan hanya lajur kiri baris yang sama." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Anggap fail besar dan banyak perubahan kecil " -#~ "tersebar." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "gagal membaca" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "gagal menulis" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "gagal membaca" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "gagal membaca" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "gagal menulis" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "gagal menulis" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: pilihan salah -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Ini adalah perisian bebas; lihat sumber untuk syarat menyalin. TIADA " -#~ "jaminan disediakan;\n" -#~ "tidak juga untuk KEBOLEHDAGANGAN atau KEUPAYAAN UNTUK SESUATU TUJUAN " -#~ "KHUSUS.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Lapor pepijat kepada <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "pilihan `-%ld' tidak lagi digunakan; guna `-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "pilihan `-%ld' tidak lagi digunakan; abaikannya" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "program subsidiari `%s' tidak dijumpai" @@ -1,15 +1,17 @@ # Dutch translations for GNU diffutils. -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # -# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2010, 2011. +# Would she be called Adinda... +# +# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2010, 2011, 2012. # Elros Cyriatan <cyriatan@fastmail.fm>, 2004. msgid "" msgstr "" -"Project-Id-Version: diffutils-3.1\n" +"Project-Id-Version: diffutils-3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-08-13 16:35+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-10-31 21:04+0100\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "Language: nl\n" @@ -27,7 +29,7 @@ msgstr "programmafout" msgid "stack overflow" msgstr "stack-overloop" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Onbekende systeemfout" @@ -140,101 +142,103 @@ msgstr "%s: optie '-W %s' vereist een argument\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "‘" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "’" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Gelukt" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Geen overeenkomsten" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ongeldige reguliere expressie" # Zie http://mailman.vrijschrift.org/pipermail/vertaling/2005-August/004670.html -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ongeldig samengesteld teken" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ongeldige tekenklassenaam" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Backslash aan het eind" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Ongeldige terugverwijzing" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Ongepaarde [ of [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Ongepaarde ( of \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Ongepaarde \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ongeldige inhoud van \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ongeldig bereikeinde" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Onvoldoende geheugen beschikbaar" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Ongeldige voorafgaande reguliere expressie" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Voortijdig einde van reguliere expressie" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Reguliere expressie is te groot" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Ongepaarde ) of \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Geen eerdere reguliere expressie" @@ -265,17 +269,17 @@ msgstr "opnieuw openen van '%s' met modus %s is mislukt" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "ongeldig argument '%3$s' van %1$s%2$s" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" +msgid "invalid suffix in %s%s argument '%s'" msgstr "ongeldig achtervoegsel in argument '%3$s' van %1$s%2$s" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "argument '%3$s' van %1$s%2$s is te groot" #: lib/version-etc.c:74 @@ -456,7 +460,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Bestanden %s en %s zijn verschillend\n" @@ -466,7 +470,7 @@ msgstr "Bestanden %s en %s zijn verschillend\n" msgid "Binary files %s and %s differ\n" msgstr "Binaire bestanden %s en %s zijn verschillend\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Geen regeleindeteken (LF) aan einde van bestand" @@ -480,14 +484,14 @@ msgstr "Torbjörn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." +msgid "Try '%s --help' for more information." msgstr "Typ '%s --help' voor meer informatie." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" +msgid "invalid --ignore-initial value '%s'" msgstr "ongeldige waarde '%s' voor '--ignore-initial'" #: src/cmp.c:147 @@ -495,14 +499,14 @@ msgstr "ongeldige waarde '%s' voor '--ignore-initial'" msgid "options -l and -s are incompatible" msgstr "opties '-l' en '-s' gaan niet samen" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "schrijven is mislukt" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standaarduitvoer" @@ -567,7 +571,7 @@ msgstr "" "dat\n" "aan het begin van elk bestand moet worden overgeslagen (standaard nul)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -586,11 +590,11 @@ msgstr "" " GB 1.000.000.000, G 1.073.741.824, enzovoort voor T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +msgid "If a FILE is '-' or missing, read standard input." msgstr "" "Als een BESTAND ontbreekt of '-' is, wordt er van standaardinvoer gelezen." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "De afsluitwaarde is 0 als de invoeren gelijk zijn, 1 als ze verschillen,\n" @@ -598,17 +602,17 @@ msgstr "" #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" +msgid "invalid --bytes value '%s'" msgstr "ongeldige waarde '%s' voor '--bytes'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" +msgid "missing operand after '%s'" msgstr "ontbrekend argument na '%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" +msgid "extra operand '%s'" msgstr "overtollig argument '%s'" #: src/cmp.c:491 @@ -627,138 +631,138 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: einde-van-bestand op %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" +msgid "invalid context length '%s'" msgstr "ongeldige contextlengte '%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "het in pagina's indelen is op deze computer niet mogelijk" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "te veel bestandslabel-opties" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" +msgid "invalid width '%s'" msgstr "ongeldige breedte '%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "conflicterende breedte-opties" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" +msgid "invalid horizon length '%s'" msgstr "ongeldige horizonlengte '%s'" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" +msgid "invalid tabsize '%s'" msgstr "ongeldige tabgrootte '%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "conflicterende tabgrootte-opties" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "zowel '--from-file' als '--to-file' zijn opgegeven" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr " --normal een gewone diff produceren (standaard)" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "-q, --brief alleen aangeven of bestanden verschillen" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files vermelden of twee bestanden hetzelfde zijn" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C AANTAL, --context[=AANTAL] dit AANTAL regels (standaard 3) van\n" " gekopieerde context tonen" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U AANTAL, --unified[=AANTAL] dit AANTAL regels (standaard 3) van\n" " geünificeerde context tonen" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "-e, --ed een ed-script produceren" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs een diff in RCS-opmaak produceren" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side het resultaat weergeven in twee kolommen" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=AANTAL maximaal dit AANTAL kolommen tonen (standaard 130)" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column bij gelijke regels alleen de linkerkolom tonen" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines de gelijke regels onderdrukken" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function vermelden in welke C-functie elke wijziging is" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE recentste regel overeenkomend met RE tonen" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" @@ -766,82 +770,86 @@ msgstr "" " --label LABEL dit LABEL gebruiken in plaats van bestandsnaam\n" " (mag herhaald worden)" -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs tabs uitschrijven naar spaties in uitvoer" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab tabs uitlijnen door invoegen van tab aan het begin" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=AANTAL tab-stops op elke AANTAL posities (standaard 8)" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty spatie of tab onderdrukken voor lege uitregels" -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate de uitvoer door 'pr' halen om deze in pagina's\n" " in te delen" -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive recursief elke gevonden submap vergelijken" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference symbolische koppelingen niet volgen" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file afwezige bestanden als leeg behandelen" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file alleen bestanden die afwezig zijn in de\n" " eerste map als leeg behandelen" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case verschil tussen hoofd- en kleine letters " "negeren\n" " bij vergelijken van bestandsnamen" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case onderscheid maken tussen hoofd- en kleine\n" " letters bij vergelijken van bestandsnamen" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PATROON bestanden uitsluiten als ze overeenkomen met " "PATROON" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=BESTAND bestanden uitsluiten die overeenkomen met\n" " een patroon in BESTAND" -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=BESTAND beginnen met BESTAND bij vergelijken van " "mappen" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -849,7 +857,7 @@ msgstr "" " --from-file=BESTAND1 BESTAND1 met alle argumenten vergelijken;\n" " BESTAND1 mag een map zijn" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -857,88 +865,88 @@ msgstr "" " --to-file=BESTAND2 alle argumenten met BESTAND2 vergelijken;\n" " BESTAND2 mag een map zijn" -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case verschil tussen hoofd- en kleine letters\n" " negeren in bestandsinhoud" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion omzettingen van tabs in spaties negeren" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space alle witruimte negeren" +msgstr "-Z, --ignore-trailing-space witruimte aan einde van regel negeren" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change wijzigingen in hoeveelheid witruimte negeren" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space alle witruimte negeren" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B, --ignore-blank-lines wijzigingen waarvan regels leeg zijn negeren" +"-B, --ignore-blank-lines wijzigingen waarvan alle regels leeg zijn " +"negeren" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE wijzigingen waarvan alle regels " "overeenkomen\n" " met reguliere expressie RE negeren" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "-a, --text alle bestanden als tekst behandelen" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Enter-tekens (CR's) aan einde van regels weglaten" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr "" " --binary gegevens in binaire modus lezen en schrijven" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAAM samengevoegd bestand tonen om verschillen in\n" " '#ifdef NAAM' te laten zien" -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GSOORT-group-format=GOPMAAK iets dergelijks, maar dan invoergroepen " "van\n" " soort GSOORT opmaken met GOPMAAK" -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LOPMAAK iets dergelijks, maar dan alle invoerregels " "opmaken\n" " met LOPMAAK" -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LSOORT-line-format=LOPMAAK iets dergelijks, maar dan invoerregels " "van\n" " soort LSOORT opmaken met LOPMAAK" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -946,13 +954,13 @@ msgstr "" " Deze opmaakopties bieden een fijnafregeling van de uitvoer aan,\n" " een generalisatie van de optie '-d/--ifdef'." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LSOORT is 'old' (oud), 'new' (nieuw), of 'unchanged' (ongewijzigd);\n" " GSOORT is LSOORT of 'changed' (gewijzigd)." -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -982,7 +990,7 @@ msgstr "" " M L+1\n" " %(A=B?Z:V) als A gelijk is aan B, dan Z anders V" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -995,7 +1003,7 @@ msgstr "" " %[-][BREEDTE][.[PREC]]{doxX}n specificatie in printf-stijl voor\n" " invoerregelnummer" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1009,20 +1017,20 @@ msgstr "" " %c'\\OOO' het teken met octaalcode OOO\n" " C het teken C (andere tekens representeren zichzelf)" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal moeite doen om een kleinere verzameling " "wijzigingen\n" " te vinden" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=AANTAL dit AANTAL regels met identieke kop en staart\n" " bij vergelijkingsproces meenemen" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" @@ -1030,76 +1038,81 @@ msgstr "" "verspreide\n" " kleine wijzigingen" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr " --help deze hulptekst tonen en stoppen" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "-v, --version programmaversie tonen en stoppen" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "BESTANDEN is 'BESTAND1 BESTAND2' of 'MAP1 MAP2' of\n" " 'MAP BESTAND...' of 'BESTAND... MAP'." -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Als '--from-file' of '--to-file' gegeven is, mag BESTANDEN van alles zijn." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." msgstr "Als een BESTAND '-' is, wordt er van standaardinvoer gelezen." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" "Gebruik: %s [OPTIE...] BESTANDEN\n" "\n" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Bestanden regel-voor-regel vergelijken." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" +msgid "conflicting %s option value '%s'" msgstr "conflicterende waarde '%2$s' van optie %1$s" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "conflicterende uitvoerstijl-opties" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Alleen in %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" msgstr "kan '-' niet met een map vergelijken" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "optie '-D' is niet mogelijk bij mappen" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Gemeenschappelijke submappen: %s en %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Bestand %s is een %s terwijl bestand %s een %s is\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Symbolische koppelingen %s en %s zijn verschillend\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Bestanden %s en %s zijn identiek\n" @@ -1115,11 +1128,11 @@ msgid "incompatible options" msgstr "niet-samengaande opties" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +msgid "'-' specified for more than one input file" msgstr "'-' opgegeven voor meer dan één invoerbestand" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lezen is mislukt" @@ -1163,7 +1176,7 @@ msgstr "" "-X als '-x' maar met rechte haken om de conflicten" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i opdrachten 'w' en 'q' toevoegen aan einde van ed-" "scripts" @@ -1271,30 +1284,30 @@ msgstr "*interne programmmafout*: ongeldig soort diff in process_diff()" msgid "invalid diff format; invalid change separator" msgstr "ongeldige diff-opmaak: ongeldig scheidingsteken voor veranderingen" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "ongeldige diff-opmaak: incomplete laatste regel" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr "hulpprogramma '%s' kan niet worden aangeroepen" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "ongeldige diff-opmaak: onjuiste tekens aan begin van regel" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "*interne programmafout*: ongeldig soort diff naar uitvoer gestuurd" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "invoerbestand is gekrompen" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" +msgid "cannot compare file names '%s' and '%s'" msgstr "kan bestandsnamen '%s' en '%s' niet vergelijken" #: src/dir.c:209 @@ -1307,86 +1320,93 @@ msgstr "%s: oneindige lus in de mappen" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o, --output=BESTAND interactief werken; het resultaat opslaan in " "BESTAND" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" "-i, --ignore-case hoofd- en kleine letters als hetzelfde zien" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion omzettingen van tabs in spaties negeren" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space alle witruimte negeren" +msgstr "-Z, --ignore-trailing-space witruimte aan einde van regel negeren" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change wijzigingen in hoeveelheid witruimte negeren" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W, --ignore-all-space alle witruimte negeren" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B, --ignore-blank-lines wijzigingen waarvan regels leeg zijn negeren" +"-B, --ignore-blank-lines wijzigingen waarvan alle regels leeg zijn " +"negeren" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE wijzigingen waarvan alle regels " +"overeenkomen\n" +" met reguliere expressie RE negeren" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Enter-tekens (CR's) aan einde van regels weglaten" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "-a, --text alle bestanden als tekst behandelen" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=AANTAL maximaal dit AANTAL kolommen tonen (standaard 130)" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l, --left-column bij gelijke regels alleen de linkerkolom tonen" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s, --suppress-common-lines de gelijke regels onderdrukken" +msgstr "-s, --suppress-common-lines de gelijke regels onderdrukken" -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs tabs uitschrijven naar spaties in uitvoer" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" " --tabsize=AANTAL tab-stops op elke AANTAL posities (standaard 8)" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal moeite doen om een kleinere verzameling " "wijzigingen\n" " te vinden" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" @@ -1394,40 +1414,40 @@ msgstr "" "verspreide\n" " kleine wijzigingen" -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PRGRM dit programma gebruiken om bestanden te " "vergelijken" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr " --help deze hulptekst tonen en stoppen" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "-v, --version programmaversie tonen en stoppen" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" "Gebruik: %s [OPTIE...] BESTAND1 BESTAND2\n" "\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Twee bestanden naast elkaar weergeven." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "kan standaardinvoer niet interactief samenvoegen" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "de te vergelijken bestanden zijn allebei mappen" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" Binary files differ@@ -1,17 +1,17 @@ # Polish translations for the GNU diffutils messages -# Copyright (C) 1996, 2002, 2004, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 2002, 2004, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# Rafał Maszkowski <rzm@icm.edu.pl>, 1996, 2002, 2004, 2009-2011 „ +# Rafał Maszkowski <rzm@icm.edu.pl>„ 1996, 2002, 2004, 2009-2012 # Contributions: # Paweł Krawczyk <kravietz@pipeta.chemia.pk.edu.pl>, 1996. # 23 corrections - Jakub Bogusz <qboosh@pld-linux.org>, 2004. # msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.1\n" +"Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-08-13 23:15+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-10-31 17:30+0100\n" "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -27,7 +27,7 @@ msgstr "błąd programu" msgid "stack overflow" msgstr "przepełnienie stosu" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Nieznany błąd systemu" @@ -140,100 +140,102 @@ msgstr "%s: opcja -W '%s' wymaga argumentu\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "„" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "”" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Powodzenie" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nie pasuje" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Błędne wyrażenie regularne" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Znak błędny dla bieżącego uporządkowania" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Błędne nazwa klasy znaków" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Końcowy ukośnik odwrotny" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Błędny odnośnik wstecz" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Nie sparowany [ lub [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Nie sparowany ( lub \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Nie sparowany \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Błędna zawartość \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Błędny koniec zakresu" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Brak pamięci" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Błędne poprzedzające wyrażenie regularne" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Przedwczesny koniec wyrażenia regularnego" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Wyrażenia regularne jest za duże" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Nie sparowany ) lub \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Brak poprzedniego wyrażenia regularnego" @@ -264,18 +266,18 @@ msgstr "nie udało się ponownie otworzyć %s z uprawnieniami %s" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" -msgstr "błędny argument %s%s: `%s'" +msgid "invalid %s%s argument '%s'" +msgstr "błędny argument %s%s: '%s'" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "błędny przyrostek argumentu %s%s: `%s'" +msgid "invalid suffix in %s%s argument '%s'" +msgstr "błędny przyrostek argumentu %s%s: '%s'" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" -msgstr "argument %s%s `%s' jest za duży" +msgid "%s%s argument '%s' too large" +msgstr "argument %s%s '%s' jest za duży" #: lib/version-etc.c:74 #, c-format @@ -451,7 +453,7 @@ msgstr "strona domowa %s: http://www.gnu.org/software/%s/\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Pomoc w używaniu oprogramowania GNU: http://www.gnu.org/gethelp/\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Pliki %s i %s różnią się\n" @@ -461,7 +463,7 @@ msgstr "Pliki %s i %s różnią się\n" msgid "Binary files %s and %s differ\n" msgstr "Binarne pliki %s i %s różnią się\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Brak znaku nowej linii na końcu pliku" @@ -475,29 +477,29 @@ msgstr "Torbjörn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Napisz `%s --help' żeby dowiedzieć się więcej." +msgid "Try '%s --help' for more information." +msgstr "Napisz '%s --help' żeby dowiedzieć się więcej." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "błędna wartość --ignore-initial `%s'" +msgid "invalid --ignore-initial value '%s'" +msgstr "błędna wartość --ignore-initial '%s'" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "sprzeczne opcje -l i -s" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "zapis nieudany" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standardowe wyjście" @@ -557,7 +559,7 @@ msgstr "" "Opcjonalne argumenty OMIŃ1 i OMIŃ2 to liczby bajtów do pominięcia na\n" "początku każdego z plików (domyślnie zero)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Obowiązkowe argumenty długich opcji są obowiązkowe też dla krótkich.\n" @@ -573,10 +575,10 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, i tak dalej dla T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Jeżeli PLIK to `-' lub go brak, czytane jest standardowe wejście." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Jeżeli PLIK to '-' lub go brak, czytane jest standardowe wejście." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status wyjściowy ma wartość 0 gdy pliki wejściowe są takie same, 1 - jeżeli\n" @@ -584,18 +586,18 @@ msgstr "" #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "błędna wartość --bytes `%s'" +msgid "invalid --bytes value '%s'" +msgstr "błędna wartość --bytes '%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "brakujący argument po `%s'" +msgid "missing operand after '%s'" +msgstr "brakujący argument po '%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "nadmiarowy argument `%s'" +msgid "extra operand '%s'" +msgstr "nadmiarowy argument '%s'" #: src/cmp.c:491 #, c-format @@ -613,139 +615,139 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF przy %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "błędna długość kontekstu `%s'" +msgid "invalid context length '%s'" +msgstr "błędna długość kontekstu '%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "stronicowanie nie jest możliwe na tej maszynie" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "za dużo opcji etykietowania plików" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "błędna szerokość `%s'" +msgid "invalid width '%s'" +msgstr "błędna szerokość '%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "sprzeczne opcje szerokości" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "błędna długość horyzontu `%s'" +msgid "invalid horizon length '%s'" +msgstr "błędna długość horyzontu '%s'" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "błędny rozmiar tabulacji `%s'" +msgid "invalid tabsize '%s'" +msgstr "błędny rozmiar tabulacji '%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "sprzeczne opcje rozmiarów TAB-a" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "równocześnie podane --from-file i --to-file" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr "" "--normal wynik w postaci zwykłego diff-a (domyślnie)" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "" "-q --brief wypisanie wyniku tylko gdy pliki się różnią" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files informowanie gdy dwa pliki są takie same" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=ILE] wypisanie ILU (domyślnie 3) linii kontekstu" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "--u, -U ILE, --unified=ILE wypisanie najwyżej ILE (domyślnie 3)\n" " linii kontekstu w trybie unified" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "-e --ed wynik w postaci poleceń ed-a" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs wynik w postaci diff-a z RCS" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side wyniki w dwóch kolumnach" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ILE wypisanie najwyżej ILE (domyślnie 130) kolumn" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column wypisanie tylko lewej kolumny dla wspólnych " "linii" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines bez wypisania wspólnych linii" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function podanie w jakiej funkcji C są zmiany" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=WYRREG wypisanie ostatniej linii pasującej do " "WYRREG" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" @@ -753,78 +755,83 @@ msgstr "" " --label ETYKIETA użycie ETYKIETY zamiast nazwy pliku\n" " (może być powtarzane)" -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs rozwinięcie TAB-ów w spacje w wyniku" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab wyrównanie linii przez użycie TAB-ów" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr " --tabsize=ILE TAB-y co ILE (domyślnie 8) kolumn" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty bez wypisywania spacji i znaków TAB przed\n" " pustymi liniami" -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-I --paginate przepuszczenie wyniku przez `pr' żeby go " +"-I --paginate przepuszczenie wyniku przez 'pr' żeby go " "stronnicować" -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive porównanie podkatalogów rekurencyjnie" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" +" --no-dereference bez podążania za dowiązaniami symbolicznymi" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N --new-file traktowanie brakujących plików jak pustych" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file traktowanie brakujących pierwszych plików\n" " w pierwszym zestawie jako pustych" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-space-change zignorowanie wielkości liter przy\n" " porównywaniu nazw plików" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case uwzględnianie wielkości liter przy\n" " porównywaniu nazw plików" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=WZÓR wykluczenie plików pasujących do WZORU" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=PLIK pominięcie plików pasujących do wzorców w " "PLIKU" -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=PLIK zacznij od PLIKU przy porównywaniu katalogów" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -832,7 +839,7 @@ msgstr "" " --from-file=PLIK1 porównanie PLIKU1 z wszystkimi\n" " argumentami; PLIK1 może być katalogiem" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -840,85 +847,85 @@ msgstr "" " --to-file=PLIK2 porównanie wszystkich argumentów\n" " z PLIKIEM2; PLIK2 może być katalogiem" -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case ignorowanie różnic między wielkimi i małymi " "literami" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion zignorowanie zmian spowodowanych\n" " rozwinięciem TAB-ów" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W --ignore-all-space ignorowanie wszystkich znaków odstępu" +msgstr "" +"-Z --ignore-trailing-space ignorowanie znaków odstępu na końcu linii" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Zignorowanie zmian ilości znaków odstępu" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space zignorowanie znaków odstępu" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines zignorowanie zmian liczby pustych linii" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE zignorowanie zmian w liniach pasujących\n" " do RE" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "-a --text traktowanie plików jako tekstowych" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr pominięcie znaków nowej linii na wejściu" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr "--binary czytanie i zapisywanie danych binarnie" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAZWA wypisanie połączonego pliku dla pokazania\n" -" różnic w `#ifdef NAZWA'" +" różnic w '#ifdef NAZWA'" -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=FMTG użyciem FMTF do sformatowania grup\n" " wejściowych typu GTYPE" -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT podobnie, ale z użyciem LFMT do\n" " sformatowania linii wejściowych" -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=FMTL użycie FMTL do sformatowania linii\n" " wejściowych typu LTYPE" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -926,11 +933,11 @@ msgstr "" " Te opcje formatowania dają dokładną kontrolę nad wynikami diff-a,\n" " są uogólnieniem -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." -msgstr "TYPL to `old', `new' albo `unchanged'. TYPG to TYPL albo `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." +msgstr "TYPL to 'old', 'new' albo 'unchanged'. TYPG to TYPL albo 'changed'." -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -958,7 +965,7 @@ msgstr "" " E F-1\n" " M L+1 %(A=B?T:E) jeżeli A równa się B, to T, jeżeli nie, to E" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -970,7 +977,7 @@ msgstr "" " %l zawartość linii z wyłączeniem znaku nowej linii\n" " %[-][SZER][.[DOKŁ]]{doxX}n specyfikację numeru linii w stylu printf" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -984,92 +991,97 @@ msgstr "" " %c'\\OOO' znak o kodzie ósemkowym OOO Z znak Z (inne znaki " "reprezentują same siebie)" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal usiłowanie znalezienia mniejszego zbioru zmian" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ILE zostawienie ILE linii wspólnego przedrostka i " "przyrostka" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files założenie: duże pliki i rozrzucone małe zmiany" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr " --help wypisanie tej pomocy i zakończenie" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "-v --version wypisanie informacji o wersji i zakończenie" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"PLIKI to `PLIK1 PLIK2' albo `KATALOG1 KATALOG2' albo `KATALOG PLIK...' albo\n" -"PLIK... KATALOG'." +"PLIKI to 'PLIK1 PLIK2' albo 'KATALOG1 KATALOG2' albo 'KATALOG PLIK...' albo\n" +"'PLIK... KATALOG'." -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Jeżeli użyta jest opcja --from-file albo --to-file, nie ma ograniczeń co do\n" "PLIKU/ÓW." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Jeżeli PLIK to `-', czytane jest standardowe wejście." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Jeżeli PLIK to '-', czytane jest standardowe wejście." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Składnia: %s [OPCJA]... PLIKI\n" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Porównanie PLIKÓW kolejnymi liniami." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "sprzeczna wartość opcji %s: `%s'" +msgid "conflicting %s option value '%s'" +msgstr "sprzeczna wartość opcji %s: '%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "sprzeczne opcje stylu wyniku" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Tylko w %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "nie można porównać `-' z katalogiem" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "nie można porównać '-' z katalogiem" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "opcja -D nie działa dla katalogów" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Wspólne podkatalogi: %s i %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Plik %s jest %s, podczas gdy plik %s jest %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Dowiązania symboliczne %s i %s różnią się\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Pliki %s i %s są identyczne\n" @@ -1085,11 +1097,11 @@ msgid "incompatible options" msgstr "niezgodne opcje" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "`-' podany dla więcej niż jednego pliku wejściowego" +msgid "'-' specified for more than one input file" +msgstr "'-' podany dla więcej niż jednego pliku wejściowego" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "nieudany odczyt" @@ -1127,8 +1139,8 @@ msgid "-X like -x, but bracket conflicts" msgstr "-X jak -x, ale z konfliktami w nawiasach" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i dodanie poleceń `w' i `q' do skryptu ed-a" +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "-i dodanie poleceń 'w' i 'q' do skryptu ed-a" #: src/diff3.c:438 msgid "" @@ -1227,31 +1239,31 @@ msgstr "błąd wewnętrzny: błędny typ diff w process_diff" msgid "invalid diff format; invalid change separator" msgstr "błędny format diff; błędny separator zmian" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "błędny format diff; niekompletna ostatnia linia" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "nie mógł być wywołany program pomocniczy `%s'" +msgid "subsidiary program '%s' could not be invoked" +msgstr "nie mógł być wywołany program pomocniczy '%s'" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "błędny format diff; nieprawidłowe znaki na początku linii" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "błąd wenwętrzny: błędny typ diff-a przekazany na wyjście" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "plik wejściowy się zmniejszył" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "nie można porównać nazw plików `%s' i `%s'" +msgid "cannot compare file names '%s' and '%s'" +msgstr "nie można porównać nazw plików '%s' i '%s'" #: src/dir.c:209 #, c-format @@ -1263,118 +1275,123 @@ msgstr "%s: rekurencyjne zapętlenie katalogów" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o, --output=PLIK tryb interakcyjny, wyniki wysyłane do PLIKU" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" "-i --ignore-case traktowanie małych i wielkich liter tak samo" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion zignorowanie zmian spowodowanych rozwinięciem\n" " TAB-ów" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W --ignore-all-space ignorowanie wszystkich znaków odstępu" +msgstr "-Z --ignore-trailing-space ignorowanie znaków odstępu na końcu linii" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change zignorowanie zmian ilości znaków odstępu" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W --ignore-all-space ignorowanie wszystkich znaków odstępu" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines zignorowanie zmian liczby pustych linii" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE zignorowanie zmian w liniach pasujących\n" +" do RE" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr pominięcie znaków nowej linii na wejściu" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "-a --text traktowanie plików jako tekstowych" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w ILE --width=ILE wypisanie najwyżej ILE (domyślnie 130) kolumn" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-I --left-column wypisanie tylko lewej kolumny dla wspólnych " "linii" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines bez wypisania wspólnych linii" -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs rozwinięcie TAB-ów w spacje w wyniku" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr " --tabsize=ILE TAB-y co ILE (domyślnie 8) kolumn" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal usiłowanie znalezienia mniejszego zbioru zmian" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" "-H --speed-large-files założenie: duże pliki i rozrzucone małe zmiany" -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM użycie PROGRAMU do porównania plików" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr " --help wypisanie tej pomocy i zakończenie" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "" "-v --version wypisanie informacji o wersji i zakończenie" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Składnia: %s [OPCJA]... PLIK1 PLIK2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Interaktywne łączenie różnic między PLIKIEM1 a PLIKIEM2." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "nie mogę interakcyjnie łączyć standardowego wejścia" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "oba mające być porównane pliki to katalogi" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex 336aa95..7a46717 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 1b5a9a0..e5d1b82 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.3\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2002-06-24 09:07GMT -3\n" "Last-Translator: Halley Pacheco de Oliveira <halleypo@ig.com.br>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -24,7 +24,7 @@ msgstr "erro do programa" msgid "stack overflow" msgstr "estouro da pilha" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" @@ -138,100 +138,102 @@ msgstr "%s: a opo `%s' requer um argumento\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Sucesso" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Sem correspondente" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "A expresso regular no vlida" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "O caracter de classificao no vlido" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "O nome da classe de caracteres no vlido" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Contrabarra final" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "A referncia retroativa no vlida" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ ou [^ sem correspondente" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( or \\( sem correspondente" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ sem correspondente" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "O countedo de \\{\\} no vlido" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "O fim do intervalo no vlido" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memria esgotada" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "A expresso regular precedente no vlida" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Fim prematuro da expresso regular" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "A expresso regular muito grande" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") or \\) sem correspondente" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Sem expresso regular prvia" @@ -263,17 +265,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "valor invlido --bytes `%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "comprimento do horizonte invlido `%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -424,7 +426,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Os arquivos %s e %s so diferentes\n" @@ -434,7 +436,7 @@ msgstr "Os arquivos %s e %s so diferentes\n" msgid "Binary files %s and %s differ\n" msgstr "Os arquivos binrios %s e %s so diferentes\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Falta o caracter nova linha no final do arquivo" @@ -448,14 +450,14 @@ msgstr "" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Utilize `%s --help' para obter mais informaes." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "valor invlido --ignore-initial `%s'" #: src/cmp.c:147 @@ -463,14 +465,14 @@ msgstr "valor invlido --ignore-initial `%s'" msgid "options -l and -s are incompatible" msgstr "as opes -l e -s no so compatveis" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "erro de escrita" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "sada padro" @@ -539,7 +541,7 @@ msgid "" msgstr "" "SALTO1 e SALTO2 correspondem ao nmero de bytes saltados em cada arquivo." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -557,26 +559,27 @@ msgstr "" "e assim por diante para T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Se ARQUIVO for igual a `-' ou for omitido, ler da entrada padro." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "valor invlido --bytes `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "faltando operando aps `%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "operando extra `%s'" #: src/cmp.c:491 @@ -595,98 +598,95 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: Fim de arquivo (EOF) em %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "o comprimento do contexto no vlido `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "este computador no suporta paginao" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "opes de rtulo de arquivo em nmero excessivo" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "largura invlida `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "opes de largura conflitantes" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "comprimento do horizonte invlido `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "tamanho de tabulao invlido `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "opes de tamanho de tabulao conflitantes" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "ambos --from-file e --to-file especificados" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Criar o diff no formato normal." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "" "-q --brief Indicar apenas se os arquivos so diferentes." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Indicar quando dois arquivos forem o idnticos." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NUM --width=NUM Limitar a sada a NUM colunas por linha (padro " -"130)." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" @@ -694,23 +694,21 @@ msgstr "" "-w NUM --width=NUM Limitar a sada a NUM colunas por linha (padro " "130)." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "" -"-a --text Considerar todos os arquivos como sendo de texto." +msgstr "-e --ed Criar um script para o editor ed" -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Criar o diff no formato RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Exibir as informaes da verso." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" @@ -718,7 +716,7 @@ msgstr "" "-w NUM --width=NUM Limitar a sada a NUM colunas por linha (padro " "130)." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" @@ -726,39 +724,39 @@ msgstr "" "-l --left-column Exibir apenas a coluna da esquerda nas linhas\n" " idnticas." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines No exibir as linhas em idnticas." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs Expandir as tabulaes para espaos na sada." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Alinhar as diferenas introduzindo um\n" " caracter de tabulao no incio." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" @@ -766,18 +764,18 @@ msgstr "" "--tabsize=NUM Parada de tabulao a cada NUM colunas\n" " (padro=8)." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate Passar a sada atravs da `pr' para paginar." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" @@ -785,41 +783,45 @@ msgstr "" "-r --recursive Comparar recursivamente os subdiretrios\n" " encontrados." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "" "-N --new-file Considerar os arquivos ausentes como vazios." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Considerar os primeiros arquivos ausentes\n" " como vazios." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case No fazer distino entre letras maisculas e\n" " minsculas nos nomes dos arquivos." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Fazer distino entre letras maisculas e\n" " minsculas nos nomes dos arquivos." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x PADRO --exclude=PADRO No comparar os arquivos cujos nomes\n" " correspondem ao PADRO." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -828,7 +830,7 @@ msgstr "" " Excluir os arquivos com nomes que correspondem\n" " a qualquer padro contido em ARQUIVO." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -836,7 +838,7 @@ msgstr "" "-S ARQUIVO --starting-file=ARQUIVO\n" " Iniciar por ARQUIVO ao comparar dois diretrios." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -845,7 +847,7 @@ msgstr "" "--from-file=ARQUIVO1 Comparar ARQUIVO1 com todos os operandos.\n" " ARQUIVO1 pode ser um diretrio." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -854,7 +856,7 @@ msgstr "" "--to-file=ARQUIVO2 Comparar todos os operandos com ARQUIVO2.\n" " ARQUIVO2 pode ser um diretrio." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" @@ -862,19 +864,19 @@ msgstr "" "-i --ignore-case No fazer distino entre letras maisculas e\n" " minsculas no contedo do arquivo." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignorar as diferenas causadas pela expanso\n" " da tabulao." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignorar todos os espaos em branco." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" @@ -882,86 +884,87 @@ msgstr "" "-b --ignore-space-change Ignorar a diferena na quantidade de espaos\n" " em branco." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignorar todos os espaos em branco." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines Ignorar diferenas nas linhas somente com " "brancos." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I EXPREG --ignore-matching-lines=EXPREG\n" " Ignorar as diferenas nas linhas que " "correspondem\n" " EXPresso REGular." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "" "-a --text Considerar todos os arquivos como sendo de texto." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Remover o caracter final de retorno de carro\n" " (CR) da entrada." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Ler e escrever os dados em modo binrio." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NOME --ifdef=NOME Exibir o arquivo mesclado incluindo\n" " `#ifndef NOME original #else modificado'\n" " nas diferenas." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "--GTYPE-group-format=GFMT Formata grupos de entrada GTYPE com GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT Formata todas as linhas de entrada com LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Formata todas as linhas de entrada LTYPE com " "LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE pode ser `old', `new', ou `unchanged'.\n" " GTYPE pode ser um dos valores de LTYPE ou `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -992,7 +995,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1006,7 +1009,7 @@ msgstr "" " %[-][LARGURA][.[PREC]]{doxX}n especificao do nmero da linha da \n" " entrada utilizando a mesma notao do comando printf()." -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1020,20 +1023,20 @@ msgstr "" " %c'C' o caracter C\n" " %c'\\OOO' o caracter com cdigo octal OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal Se esforar para encontrar o menor conjunto\n" " de diferenas." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=N Manter N linhas de prefixo e sufixo idnticos." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1041,79 +1044,87 @@ msgstr "" "-H --speed-large-files Assumir arquivos grandes e muitas alteraes\n" " pequenas espalhadas." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Exibir as informaes da verso." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "ARQUIVOS so `ARQUIVO1 ARQUIVO2' ou\n" " `DIR1 DIR2' ou\n" " `DIR ARQUIVO...' ou\n" " `ARQUIVO... DIR'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se --from-file ou --to-file for especificado, no h restrio em ARQUIVOS." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Se ARQUIVO for igual a `-', ler da entrada padro." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Utilizao: %s [OPO]... ARQUIVOS\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Comparar os arquivos linha por linha" -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "conflitando %s valor da opo `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "opes de estilo de sada conflitantes" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Somente em %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "impossvel comparar `-' com um diretrio" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "a opo -D no suportada com diretrios" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdiretrios idnticos: %s e %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "O arquivo %s %s enquanto o arquivo %s %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Os arquivos %s e %s so diferentes\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Os aquivos %s e %s so idnticos\n" @@ -1130,11 +1141,12 @@ msgid "incompatible options" msgstr "opes incompatveis" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' especificado para mais de um arquivo de entrada" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "falha de leitura" @@ -1179,15 +1191,12 @@ msgstr "" "-x --overlap-only Exibir somente as diferenas que se sobrepem." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Exibir as diferenas sem mesclar,\n" -" conflitos entre parnteses." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i Incluir os comandos `w' e `q' no script do ed." @@ -1229,10 +1238,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" msgstr "" -"-a --text Considerar todos os arquivos como sendo de texto." #: src/diff3.c:449 #, fuzzy @@ -1283,30 +1290,30 @@ msgstr "erro interno: tipo de diff invlido em process_diff" msgid "invalid diff format; invalid change separator" msgstr "formato de diff invlido; separador de diferena invlido" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "formato de diff invlido; a ltima linha no est completa" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, fuzzy, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr "o programa auxiliar `%s' no foi encontrado" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "formato de diff invlido; caracteres incorretos na linha de incio" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "erro interno: tipo de diff invlido passado para a sada" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "o arquivo de entrada diminuiu" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "impossvel comparar os nomes dos arquivos `%s' e `%s'" #: src/dir.c:209 @@ -1320,7 +1327,7 @@ msgstr "" msgid "Thomas Lord" msgstr "Escrito por Thomas Lord." -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" @@ -1328,7 +1335,7 @@ msgstr "" "-o ARQUIVO --output=ARQUIVO Agir interativamente, direcionando a sada " "para ARQUIVO." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" @@ -1336,19 +1343,19 @@ msgstr "" "-i --ignore-case No fazer distino entre letras maisculas\n" " e minsculas." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignorar as diferenas causadas pela expanso\n" " da tabulao." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignorar todos os espaos em branco." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" @@ -1356,32 +1363,41 @@ msgstr "" "-b --ignore-space-change Ignorar a diferena na quantidade de espaos\n" " em branco." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignorar todos os espaos em branco." +msgstr "-W --ignore-all-space Ignorar todos os espaos em branco." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B --ignore-blank-lines Ignorar diferenas nas linhas somente com " "brancos." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I EXPREG --ignore-matching-lines=EXPREG\n" +" Ignorar as diferenas nas linhas que " +"correspondem\n" +" EXPresso REGular." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Remover o caracter final de retorno de carro\n" " (CR) da entrada." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "" "-a --text Considerar todos os arquivos como sendo de texto." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" @@ -1389,7 +1405,7 @@ msgstr "" "-w NUM --width=NUM Limitar a sada a NUM colunas por linha (padro " "130)." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" @@ -1397,18 +1413,18 @@ msgstr "" "-l --left-column Exibir apenas a coluna da esquerda nas linhas\n" " idnticas." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines No exibir as linhas em idnticas." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs Expandir as tabulaes para espaos na sada." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" @@ -1416,14 +1432,14 @@ msgstr "" "--tabsize=NUM Parada de tabulao a cada NUM colunas\n" " (padro=8)." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal Se esforar para encontrar o menor conjunto\n" " de diferenas." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1431,41 +1447,39 @@ msgstr "" "-H --speed-large-files Assumir arquivos grandes e muitas alteraes\n" " pequenas espalhadas." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAMA Usar o PROGRAMA para comparar os arquivos." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr "" -"-a --text Considerar todos os arquivos como sendo de texto." -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Exibir as informaes da verso." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Utilizao: %s [OPO]... ARQUIVO1 ARQUIVO2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Mesclagem lado a lado das diferenas dos arquivos." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "impossvel mesclar interativamente a entrada padro" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "os dois arquivos a serem comparados so diretrios" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1490,6 +1504,23 @@ msgstr "" "v:\tIncluir verbosamente as linhas idnticas.\n" "q:\tSair.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: a opo -- %c ilegal\n" + +#~ msgid "" +#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" +#~ "You may redistribute copies of this program\n" +#~ "under the terms of the GNU General Public License.\n" +#~ "For more information about these matters, see the files named COPYING." +#~ msgstr "" +#~ "Este programa no tem nenhum tipo de garantia, o tanto quanto\n" +#~ " permitido por lei. Voc pode redistribuir cpias deste\n" +#~ "programa sob os termos da Licena Pblica Geral GNU. Para\n" +#~ "mais informaes a este respeito, leia o arquivo COPYING." + +#~ msgid "Written by Torbjorn Granlund and David MacKenzie." +#~ msgstr "Escrito por Torbjrn Granlund e David MacKenzie." + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SALTO1:SALTO2 --ignore-initial=SALTO1:SALTO2" @@ -1498,59 +1529,31 @@ msgstr "" #~ "-s --quiet --silent No exibir nada; retornar apenas o status de " #~ "fim." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Exibir as informaes da verso." - #~ msgid "--help Output this help." #~ msgstr "--help Exibir esta ajuda." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Comparar trs arquivos linha por linha." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignorar as diferenas causadas pela expanso\n" -#~ " da tabulao." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Relatar os problemas para <bug-gnu-utils@gnu.org>." -#, fuzzy #~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Ignorar a diferena na quantidade de espaos\n" -#~ " em branco." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorar todos os espaos em branco." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." +#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman, and Len Tower." #~ msgstr "" -#~ "-B --ignore-blank-lines Ignorar diferenas nas linhas somente com " -#~ "brancos." +#~ "Escrito por Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman, e Len Tower." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Remover o caracter final de retorno de carro\n" -#~ " (CR) da entrada." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "a opo `-%ld' est obsoleta; usar `-%c %ld'" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "" -#~ "-a --text Considerar todos os arquivos como sendo de " -#~ "texto." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "a opo `-%ld' est obsoleta; omita-a" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1567,10 +1570,6 @@ msgstr "" #~ " Exibir a linha mais recente que corresponde\n" #~ " EXPresso REGular." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Criar um script para o editor ed" - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1585,41 +1584,12 @@ msgstr "" #~ " idnticas.\n" #~ " --suppress-common-lines No exibir as linhas idnticas." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t --expand-tabs Expandir as tabulaes para espaos na sada." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Alinhar as diferenas introduzindo um\n" -#~ " caracter de tabulao no incio." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NUM Parada de tabulao a cada NUM colunas\n" -#~ " (padro=8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "" -#~ "-d --minimal Se esforar para encontrar o menor conjunto\n" -#~ " de diferenas." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Assumir arquivos grandes e muitas alteraes\n" #~ " pequenas espalhadas." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Exibir todas as diferenas,\n" -#~ " com os conflitos entre parnteses." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "" #~ "-X Exibir as diferenas que se sobrepem,\n" @@ -1634,93 +1604,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L RTULO --label=RTULO Usar RTULO em vez do nome do arquivo." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=PROGRAMA Usar o PROGRAMA para comparar os arquivos." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignorar todos os espaos em branco." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NUM --width=NUM Limitar a sada a NUM colunas por linha " -#~ "(padro 130)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Exibir apenas a coluna da esquerda nas " -#~ "linhas\n" -#~ " idnticas." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Assumir arquivos grandes e muitas alteraes\n" -#~ " pequenas espalhadas." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "falha de leitura" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "erro de escrita" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "falha de leitura" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "falha de leitura" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "erro de escrita" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "erro de escrita" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: a opo -- %c ilegal\n" - -#~ msgid "" -#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" -#~ "You may redistribute copies of this program\n" -#~ "under the terms of the GNU General Public License.\n" -#~ "For more information about these matters, see the files named COPYING." -#~ msgstr "" -#~ "Este programa no tem nenhum tipo de garantia, o tanto quanto\n" -#~ " permitido por lei. Voc pode redistribuir cpias deste\n" -#~ "programa sob os termos da Licena Pblica Geral GNU. Para\n" -#~ "mais informaes a este respeito, leia o arquivo COPYING." - -#~ msgid "Written by Torbjorn Granlund and David MacKenzie." -#~ msgstr "Escrito por Torbjrn Granlund e David MacKenzie." - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Relatar os problemas para <bug-gnu-utils@gnu.org>." - -#~ msgid "" -#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman, and Len Tower." -#~ msgstr "" -#~ "Escrito por Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman, e Len Tower." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "a opo `-%ld' est obsoleta; usar `-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "a opo `-%ld' est obsoleta; omita-a" - #~ msgid "subsidiary program `%s' failed" #~ msgstr "o programa auxiliar `%s' falhou" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.3\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2003-08-22 08:43+0300\n" "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -24,7 +24,7 @@ msgstr "eroare de program" msgid "stack overflow" msgstr "stiv plin(overflow)" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Eroare de sistem necunoscut" @@ -138,100 +138,102 @@ msgstr "%s: opiunea `%s' necesit un parametru\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Succes" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Nici o potrivire" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Expresie normal(regular) invalid" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Caracter de comparare invalid" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Nume clas caracter invalid" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Backslash de sfrit de linie(trailing)" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Referin precedent invalid" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ sau [^ nenchise" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( or \\( nenchise" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ nenchis" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Coninut invalid al \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Sfrit de domeniu invalid" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Memorie plin" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Expresie normal de preceden invalid" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Sfrit prematur de expresie normal" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Expresie normal prea mare" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") or \\) nedeschise" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Nu a existat nici o expresie normal antecedent" @@ -263,17 +265,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "valoare --bytes invalid `%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "lungime de orizont invalid `%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -424,7 +426,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Fiierele %s i %s difer\n" @@ -434,7 +436,7 @@ msgstr "Fiierele %s i %s difer\n" msgid "Binary files %s and %s differ\n" msgstr "Fiierele binare %s i %s difer\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Nici un element de linie nou la sfritul fiierului" @@ -448,14 +450,14 @@ msgstr "" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "ncercai `%s --help' pentru mai multe informaii." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "invalid --se ignor valoarea iniial `%s'" #: src/cmp.c:147 @@ -463,14 +465,14 @@ msgstr "invalid --se ignor valoarea iniial `%s'" msgid "options -l and -s are incompatible" msgstr "opiunile -l i -s sunt incompatibile" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "scriere euat" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "ieire(output) standard" @@ -535,7 +537,7 @@ msgid "" msgstr "" "OMIS1 i OMIS2 sunt numerele de octei care s fie omii din fiecare fiier." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -551,27 +553,28 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, i aa mai departe pentru T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "" "Dac un FIIER este `-' sau lipsete, se citete intrarea(input) standard." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "valoare --bytes invalid `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "lipsete operandul dup `%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "operand n plus(extra) `%s'" #: src/cmp.c:491 @@ -590,160 +593,157 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF n %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "lungime invalid de context `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "paginaie nesuportat de acest host" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "prea multe opiuni de etichete fiier" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "lungime invalid `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "opiuni de lungime n conflict" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "lungime de orizont invalid `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "mrime tab invalid `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "opiuni mrime tab n conflict" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr " --from-file i --to-file sunt specificate mpreun" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Afieaz un diff normal." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Afieaz doar dac fiierele difer." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Raporteaz cnd dou fiiere sunt asemntoare." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w NUM --width=NUM Afieaz cel mult NUM (implicit 130) coloane tiprite." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w NUM --width=NUM Afieaz cel mult NUM (implicit 130) coloane tiprite." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Trateaz toate fiierele ca text." +msgstr "-e --ed Afieaz un script ed." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Afieaz un diff n format RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Tiprete informaii despre versiune." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NUM --width=NUM Afieaz cel mult NUM (implicit 130) coloane tiprite." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Afieaz doar coloana din stnga a liniilor comune." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nu afia liniile comune." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Schimb tab-urile n spaii la ieire(output)." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Aliniaz tab-urile adugnd n fa un tab." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" @@ -751,52 +751,56 @@ msgstr "" "--tabsize=NUM Opririle tab-ului vor fi la fiecare NUM (implicit 8) coloane " "tiprite." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate Trimite ieirea(output) prin `pr' pentru a fi paginat." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Compar recursiv orice subdirector ntlnit." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Trateaz fiierele lips ca vide." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Trateaz primele fiiere lips ca vide." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Ignor cazul cnd se compar numele de fiiere." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Ia n calcul cazul atunci cnd se compar numele " "de fiiere." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x TIP --exclude=TIP Exclude fiierele care se potrivesc TIParului." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -804,7 +808,7 @@ msgstr "" "-X FIIER --exclude-from=FIIER Exclude fiierele care se potrivesc " "oricrui tipar din FIIER." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -812,7 +816,7 @@ msgstr "" "-S FIIER --starting-file=FIIER ncepe cu FIIER n compararea " "directoarelor." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -821,7 +825,7 @@ msgstr "" "--from-file=FIIER1 Compar FIIER1 cu toi operanzii. FIIER1 poate fi " "director." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -830,107 +834,108 @@ msgstr "" "--to-file=FIIER2 Compar toi operanzii cu FIIER2. FIIER2 poate fi " "director." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case Ignor diferenele de caz din coninutul fiierului." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignor schimbrile produse de modificarea tab-" "ului." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignor tot spaiul vid." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignor schimbrile din spaiul vid." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignor tot spaiul vid." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B --ignore-blank-lines Ignor schimbrile unde toate liniile sunt goale" -"(blank)." +"-B --ignore-blank-lines Ignor schimbrile unde toate liniile sunt " +"goale(blank)." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Ignor schimbrile la toate liniile care " "se potrivesc RE-ului." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Trateaz toate fiierele ca text." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimin returul de car(carriage return) final la intrare" -"(input)." +"--strip-trailing-cr Elimin returul de car(carriage return) final la " +"intrare(input)." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Citete i scrie date n mod binar." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NUME --ifdef=NUME Afieaz fiierul rezultat(merged) pentru a arta " "diff-urile`#ifdef NAME'." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Similar, dar formatul de intrare GTYPE se " "grupeaz cu GFMT." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT Similar, dar formateaz toate liniile cu LFMT." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Similar, dar formateaz liniile de intrare LTYPE " "cu LFMT." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE este `old', `new', sau `unchanged'. GTYPE este LTYPE sau `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -960,7 +965,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -974,7 +979,7 @@ msgstr "" " %[-][WIDTH][.[PREC]]{doxX}n specificaii stil printf-pentru " "introducerea numrului de linie" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -988,18 +993,18 @@ msgstr "" " %c'C' caracterul singular C\n" " %c'\\OOO' caracterul cu codul octal OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal ncearc din greu s gseti un set mai mic de schimbri" -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM Reine NUM linii de prefix i sufix comun." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1007,23 +1012,24 @@ msgstr "" "-H --speed-large-files Presupune fiiere mari i multe modificri mici " "mprtiate." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Tiprete informaii despre versiune." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FIIEREle sunt `FIIER1 FIIER2' sau `DIR1 DIR2' sau `DIR FIIER...' or " "`FIIER... DIR'." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." @@ -1031,54 +1037,61 @@ msgstr "" "Dac --from-file sau --to-file sunt precizate, nu exist restricii pe " "FIIERE." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Dac FIIER este `-', se citete intrarea(input) standard." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Folosire: %s [OPIUNE]... FIIERE\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Compar fiierele linie cu linie." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "Exist un conflict cu %s n valoarea opiunii `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "Conflict n opiunile stilului de afiare(output)" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Doar n %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "nu se poate compara `-' cu un director" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "opiunea -D nu este compatibil cu directoarele" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectoare comune: %s i %s.\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Fiierul %s este un %s pe cnd fiierul %s este un %s.\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Fiierele %s i %s difer\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Fiierele %s i %s sunt identice\n" @@ -1095,11 +1108,12 @@ msgid "incompatible options" msgstr "opiuni incompatibile" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' specificat pentru mai mult de un fiier de intrare(input)" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "citire euat" @@ -1140,15 +1154,12 @@ msgid "" msgstr "-x --overlap-only Afieaz toate schimbrile de suprapunere." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Afieaz modificrile nerezultate(unmerged), conflictele " -"de paranteze." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Adaug comenzile `w' i `q' la scripturile ed." #: src/diff3.c:438 @@ -1166,8 +1177,8 @@ msgstr "-a --text Trateaz toate fiierele ca text." #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimin returul de car(carriage return) final la intrare" -"(input)." +"--strip-trailing-cr Elimin returul de car(carriage return) final la " +"intrare(input)." #: src/diff3.c:443 #, fuzzy @@ -1186,9 +1197,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Trateaz toate fiierele ca text." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1239,30 +1249,30 @@ msgstr "eroare intern: tip diff invalid n process_diff" msgid "invalid diff format; invalid change separator" msgstr "format diff invalid; separator de modificare invalid" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "format diff invalid; ultim-linie incomplet" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, fuzzy, c-format -msgid "subsidiary program `%s' could not be invoked" +msgid "subsidiary program '%s' could not be invoked" msgstr "programul subsidiar `%s' nu a fost gsit" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "format diff invalid; caractere precedente liniei incorecte" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "eroare intern: tip invalid de diff trimis spre ieire(output)" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "fiier de intrare(input) micorat" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "nu se pot compara numele de fiiere `%s' i `%s'" #: src/dir.c:209 @@ -1276,7 +1286,7 @@ msgstr "" msgid "Thomas Lord" msgstr "Scris de Thomas Lord." -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" @@ -1284,79 +1294,86 @@ msgstr "" "-o FIIER --output=FIIER Opereaz interactiv, trimind outputul spre " "FIIER." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" "-i --ignore-case Consider majusculele i minusculele ca fiind aceleai." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignor schimbrile produse de modificarea tab-" "ului." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignor tot spaiul vid." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignor schimbrile din spaiul vid." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Ignor tot spaiul vid." +msgstr "-W --ignore-all-space Ignor tot spaiul gol." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B --ignore-blank-lines Ignor schimbrile unde toate liniile sunt goale" -"(blank)." +"-B --ignore-blank-lines Ignor schimbrile unde toate liniile sunt " +"goale(blank)." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE Ignor schimbrile la toate liniile care " +"se potrivesc RE-ului." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -"--strip-trailing-cr Elimin returul de car(carriage return) final la intrare" -"(input)." +"--strip-trailing-cr Elimin returul de car(carriage return) final la " +"intrare(input)." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Trateaz toate fiierele ca text." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NUM --width=NUM Afieaz cel mult NUM (implicit 130) coloane tiprite." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Afieaz doar coloana din stnga a liniilor comune." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nu afia liniile comune." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Schimb tab-urile n spaii la ieire(output)." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" @@ -1364,13 +1381,13 @@ msgstr "" "--tabsize=NUM Opririle tab-ului vor fi la fiecare NUM (implicit 8) coloane " "tiprite." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal ncearc din greu s gseti un set mai mic de schimbri" -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1378,40 +1395,39 @@ msgstr "" "-H --speed-large-files Presupune fiiere mari i multe modificri mici " "mprtiate." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Folosete PROGRAM pentru a compara fiierele." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Trateaz toate fiierele ca text." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Tiprete informaii despre versiune." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Folosire: %s [OPIUNE]... FIIER1 FIIER2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Analiz pas cu pas a diferenelor de fiiere." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "nu poate rezulta(merge) interactiv intrarea(input) standard" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "ambele fiiere de comparat sunt directoare" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1437,6 +1453,24 @@ msgstr "" "v:\tInclude detaliat liniile comune.\n" "q:\tIeire.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: opiune ilegal -- %c\n" + +#~ msgid "" +#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" +#~ "You may redistribute copies of this program\n" +#~ "under the terms of the GNU General Public License.\n" +#~ "For more information about these matters, see the files named COPYING." +#~ msgstr "" +#~ "Acest program NU vine cu NICI O GARANIE, n msura permis de lege.\n" +#~ "Putei redistribui copii ale acestui program\n" +#~ "sub termenii Licenei Publice Generale GNU.\n" +#~ "Pentru mai multe informaii despre aceste chestiuni, citii fiierul " +#~ "numit COPYING." + +#~ msgid "Written by Torbjorn Granlund and David MacKenzie." +#~ msgstr "Scris de Torbjorn Granlund i David MacKenzie." + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i OMIS1:OMIS2 --ignore-initial=OMIS1:OMIS2" @@ -1445,55 +1479,31 @@ msgstr "" #~ "-s --quiet --silent Nu tiprete nimic; anun(yield) doar starea de " #~ "ieire." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Tiprete informaii despre versiune." - #~ msgid "--help Output this help." #~ msgstr "--help Tiprete acest ajutor." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Compar trei fiiere linie cu linie" - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Ignor schimbrile produse de modificarea tab-" -#~ "ului." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "Raportai erorile(bugs)la <bug-gnu-utils@gnu.org>." -#, fuzzy #~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Ignor schimbrile din spaiul vid." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignor tot spaiul gol." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." +#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman, and Len Tower." #~ msgstr "" -#~ "-B --ignore-blank-lines Ignor schimbrile unde toate liniile sunt goale" -#~ "(blank)." +#~ "Scris de Paul Eggert, Mike Haertel, David Hayes,\n" +#~ "Richard Stallman, i Len Tower." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr Elimin returul de car(carriage return) final la " -#~ "intrare(input)." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "`-%ld' opiunea este nvechit; folosii `-%c %ld'" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Trateaz toate fiierele ca text." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "`-%ld' opiunea este nvechit; omitei-o" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1507,10 +1517,6 @@ msgstr "" #~ " -F RE --show-function-line=RE Afieaz cele mai recente linii care se " #~ "potrivesc RE." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Afieaz un script ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1523,36 +1529,12 @@ msgstr "" #~ " --left-column Afieaz doar coloana din stnga a liniilor comune.\n" #~ " --suppress-common-lines Nu afia liniile comune." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Schimb tab-urile n spaii la ieire(output)." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Aliniaz tab-urile adugnd n fa un tab." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=NUM Opririle tab-ului vor fi la fiecare NUM (implicit 8) " -#~ "coloane tiprite." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "" -#~ "-d --minimal ncearc din greu s gseti un set mai mic de schimbri" - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Presupune fiiere mari i multe modificri mici " #~ "mprtiate." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Afieaz toate modificrile, conflictele de paranteze." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Afieaz schimbrile de suprapunere, punndu-le n paranteze." @@ -1566,92 +1548,6 @@ msgstr "" #~ "-L ETICHET --label=ETICHET Folosete ETICHET n loc de numele " #~ "fiierului." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=PROGRAM Folosete PROGRAM pentru a compara fiierele." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Ignor tot spaiul gol." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w NUM --width=NUM Afieaz cel mult NUM (implicit 130) coloane " -#~ "tiprite." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "" -#~ "-l --left-column Afieaz doar coloana din stnga a liniilor comune." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Presupune fiiere mari i multe modificri mici " -#~ "mprtiate." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "citire euat" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "scriere euat" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "citire euat" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "citire euat" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "scriere euat" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "scriere euat" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: opiune ilegal -- %c\n" - -#~ msgid "" -#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" -#~ "You may redistribute copies of this program\n" -#~ "under the terms of the GNU General Public License.\n" -#~ "For more information about these matters, see the files named COPYING." -#~ msgstr "" -#~ "Acest program NU vine cu NICI O GARANIE, n msura permis de lege.\n" -#~ "Putei redistribui copii ale acestui program\n" -#~ "sub termenii Licenei Publice Generale GNU.\n" -#~ "Pentru mai multe informaii despre aceste chestiuni, citii fiierul " -#~ "numit COPYING." - -#~ msgid "Written by Torbjorn Granlund and David MacKenzie." -#~ msgstr "Scris de Torbjorn Granlund i David MacKenzie." - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "Raportai erorile(bugs)la <bug-gnu-utils@gnu.org>." - -#~ msgid "" -#~ "Written by Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman, and Len Tower." -#~ msgstr "" -#~ "Scris de Paul Eggert, Mike Haertel, David Hayes,\n" -#~ "Richard Stallman, i Len Tower." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "`-%ld' opiunea este nvechit; folosii `-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "`-%ld' opiunea este nvechit; omitei-o" - #~ msgid "subsidiary program `%s' failed" #~ msgstr "programul subsidiar `%s' euat" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2007-02-13 07:13+0300\n" "Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n" "Language-Team: Russian <ru@li.org>\n" @@ -23,7 +23,7 @@ msgstr " " msgid "stack overflow" msgstr " " -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr " " @@ -136,100 +136,102 @@ msgstr "%s: `%s' c \n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr " " -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr " " -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr " " -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr " " -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr " " -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr " " -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr " [ [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr " ( \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr " \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr " \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr " " -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr " " -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr " " -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr " " -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr " " -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr " ) \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr " " @@ -261,17 +263,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr " --bytes `%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr " `%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -439,7 +441,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr " %s %s \n" @@ -449,7 +451,7 @@ msgstr " %s %s \n" msgid "Binary files %s and %s differ\n" msgstr " %s %s \n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr " " @@ -463,14 +465,14 @@ msgstr "أ " msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr " `%s --help' ." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr " --ignore-initial `%s'" #: src/cmp.c:147 @@ -478,14 +480,14 @@ msgstr " --ignore-initial `%s'" msgid "options -l and -s are incompatible" msgstr " -l -s " -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr " " -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr " " @@ -547,7 +549,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "1 2 -- , ." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -563,28 +565,29 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr " `-', ." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" " 0, , 1 -- \n" ", 2 ." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr " --bytes `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr " `%s'" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr " `%s'" #: src/cmp.c:491 @@ -603,96 +606,93 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr " `%s'" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr " " -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr " " -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr " `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr " " -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr " `%s'" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr " `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr " " -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr " --from-file, --to-file" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal diff." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief ." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files ." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w --width= .\n" -" ( 130)" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" @@ -700,22 +700,21 @@ msgstr "" "-w --width= .\n" " ( 130)" -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text ." +msgstr "-e --ed ed." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs RCS." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version ." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" @@ -723,96 +722,100 @@ msgstr "" "-w --width= .\n" " ( 130)" -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column ." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines ." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs ." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab ." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" "--tabsize= ( 8)." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate `pr' ." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive ." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file ." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file " "." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case ." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "--no-ignore-file-name-case ." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x --exclude= , " "." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -821,13 +824,13 @@ msgstr "" "\n" " ." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S --starting-file= ." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -836,7 +839,7 @@ msgstr "" "--from-file=1 1 .\n" " 1 ." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -845,73 +848,73 @@ msgstr "" "--to-file=2 2. 2 " "." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case ." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion , " "." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space ." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change ." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space ." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines ." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I --ignore-matching-lines= , \n" " " "" -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text ." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr ." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary ." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D --ifdef= , `#ifdef '." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" @@ -919,13 +922,13 @@ msgstr "" "\n" " ." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format= , ." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" @@ -933,18 +936,19 @@ msgstr "" "\n" " ." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " `old', `new', `unchanged', -- `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -973,7 +977,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -986,7 +990,7 @@ msgstr "" " %l , \n" " %[-][][.[]]{doxX}n printf" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1000,18 +1004,18 @@ msgstr "" " %c'' \n" " %c'\\OOO' OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal ." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines= ." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1019,76 +1023,84 @@ msgstr "" "-H --speed-large-files , \n" " ." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version ." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" " `1 2', `1 2', ` ...',\n" " `... '." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr " --from-file --to-file, ." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr " `-', ." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr ": %s []... \n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr " ." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr " %s `%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr " " -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr " %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr " `-' " -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D option not supported with directories" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr " : %s %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr " %s %s, %s -- %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr " %s %s \n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr " %s %s \n" @@ -1104,11 +1116,12 @@ msgid "incompatible options" msgstr " " #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "`-' " -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr " " @@ -1148,15 +1161,12 @@ msgid "" msgstr "-x --overlap-only ." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap ,\n" -" ." #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i `w' `q' ed." #: src/diff3.c:438 @@ -1195,9 +1205,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text ." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1250,30 +1259,30 @@ msgstr " : `process_diff'" msgid "invalid diff format; invalid change separator" msgstr " ; " -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr " ; " -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr " `%s'" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr " ; " -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr " : " -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr " " #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr " `%s' `%s'" #: src/dir.c:209 @@ -1286,58 +1295,66 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o --output= , ." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case ." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion , " "." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space ." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change ." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space ." +msgstr "-W --ignore-all-space ." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines ." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I --ignore-matching-lines= , \n" +" " +"" + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr ." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text ." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" @@ -1345,35 +1362,35 @@ msgstr "" "-w --width= .\n" " ( 130)" -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column ." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines ." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs ." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" "--tabsize= ( 8)." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal ." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" @@ -1381,42 +1398,41 @@ msgstr "" "-H --speed-large-files , \n" " ." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" "--diff-program= " "." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text ." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version ." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr ": %s []... 1 2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr " ." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr " " -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr " -- " -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1441,6 +1457,19 @@ msgstr "" "v:\t , .\n" "q:\t.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ " ; \n" +#~ " . ; \n" +#~ " - .\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i 1:2 --ignore-initial=1:2" @@ -1448,54 +1477,24 @@ msgstr "" #~ msgstr "" #~ "-s --quiet --silent , ." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version ." - #~ msgid "--help Output this help." #~ msgstr "--help ." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr " ." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion , " -#~ "." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change " -#~ "." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space ." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "" -#~ "-B --ignore-blank-lines ." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr " <bug-gnu-utils@gnu.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr ." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr " `-%ld' ; `-%c %ld'" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text ." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr " `-%ld' ; " -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1509,10 +1508,6 @@ msgstr "" #~ "\n" #~ " ." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1526,38 +1521,12 @@ msgstr "" #~ " --left-column .\n" #~ " --suppress-common-lines ." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t --expand-tabs ." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab " -#~ "." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize= ( 8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal ." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files , \n" #~ " ." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all , " -#~ "." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X , ." @@ -1569,81 +1538,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L --label= ." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program= " -#~ "." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space ." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w --width= " -#~ ".\n" -#~ " ( 130)" - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column ." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files , \n" -#~ " ." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr " " - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr " " - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ " ; \n" -#~ " . ; \n" -#~ " - .\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr " <bug-gnu-utils@gnu.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr " `-%ld' ; `-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr " `-%ld' ; " - #~ msgid "subsidiary program `%s' not found" #~ msgstr " `%s'" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-04-15 21:46-0400\n" "Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n" "Language-Team: Serbian <gnu@prevod.org>\n" @@ -23,7 +23,7 @@ msgstr "грешка програма" msgid "stack overflow" msgstr "стек препуњен" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Непозната системска грешка" @@ -136,100 +136,102 @@ msgstr "%s: опција „%s“ захтева аргумент\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Успешно" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Без поклапања" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Неисправан регуларни израз" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Неисправан колациони знак" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Неправилно име класе знакова" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Пратећа обрнута коса црта" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Неисправна повратна референца" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Неупарено [ или [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Неупарено ( или \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Неупарено \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Неисправан садржај у \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Неисправан крај опсега" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Меморија исцрпљена" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Неисправан претходећи регуларни израз" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Преран завршетак регуларног израза" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Регуларни израз исувише велики" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Неупарено ) или \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Без прошлог регуларног израза" @@ -261,17 +263,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "неисправна --bytes вредност „%s“" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "неисправна дужина видокруга „%s“" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -439,7 +441,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Датотеке %s и %s различите\n" @@ -449,7 +451,7 @@ msgstr "Датотеке %s и %s различите\n" msgid "Binary files %s and %s differ\n" msgstr "Бинарне датотеке %s и %s различите\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Без новог реда на крају датотеке" @@ -463,14 +465,14 @@ msgstr "Торбјорн Гранлунд" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "Покушајте `%s --help' за подробније објашњење." #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "неисправна --ignore-initial вредност „%s“" #: src/cmp.c:147 @@ -478,14 +480,14 @@ msgstr "неисправна --ignore-initial вредност „%s“" msgid "options -l and -s are incompatible" msgstr "опције -l и -s не иду заједно" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "записивање неуспешано" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "стандардни излаз" @@ -547,7 +549,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "БРОЈ1 и БРОЈ2 су бројеви бајтова за изостављање у свакој датотеци." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -564,26 +566,27 @@ msgstr "" "итд. за T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "Читати стандардни улаз ако ДАТОТЕКА недостаје или је „-“." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Излазно стање је 0 ако су улази исти, 1 за различите, 2 за грешку." #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "неисправна --bytes вредност „%s“" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "недостаје оператор после „%s“" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "вишак оператор „%s“" #: src/cmp.c:491 @@ -602,210 +605,211 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF на %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "неисправна дужина склопа „%s“" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "прелом страна није подржан на овом рачунару" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "исувише опција за ознаку датотека" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "неисправна дужина „%s“" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "сукобљене опције ширине" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "неисправна дужина видокруга „%s“" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "неисправна величина табулатора „%s“" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "сукобљене опције величине табулатора" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "„--from-file“ и „--to-file“ обоје наведени" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Излаз је обичан „diff“." -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Пријави само да ли се датотеке разликују." -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Пријави када су две датотеке исте." -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w БРЈ --width=БРЈ Ширина излаза је највише БРЈ (почетно 130) колона." -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w БРЈ --width=БРЈ Ширина излаза је највише БРЈ (почетно 130) колона." -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text Прихвати све датотеке као текст." +msgstr "-e --ed Излаз је „ed“ спис." -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Излаз је RCS облик „diff-а“." -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Извести о верзији." +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w БРЈ --width=БРЈ Ширина излаза је највише БРЈ (почетно 130) колона." -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Испиши само леву колону заједничких редова." -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Не приказуј заједничке редове." -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Развиј табулаторе у размаке за излаз." -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Поравнај табулаторе додајући један табулатор." -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=БРЈ Величина табулатора је БРЈ (почетно 8) колона." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Пропусти излаз кроз „pr“ за прелом." -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Рекурзивно упореди све пронађене поддиректоријуме." -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Недостајуће датотеке се узимају за празне." -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Прве недостајуће датотеке се узимају за празне." -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Занемари словну величину поређујући имена датотека." -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Урачунај словну величину поређујући имена " "датотека." -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x ОБР --exclude=ОБР Изузми датотеке које поклапа ОБР." -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -813,14 +817,14 @@ msgstr "" "-X ТЕКА --exclude-from=ТЕКА Изузми датотеке које поклапа било који образац " "у ТЕКА." -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S ТЕКА --starting-file=ТЕКА Почни од ТЕКА при поређењу директоријума." -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -829,7 +833,7 @@ msgstr "" "--from-file=ТЕКА1 Упореди ТЕКА1 са свим оперантима. ТЕКА1 може бити " "директоријум." -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -837,96 +841,97 @@ msgid "" msgstr "" "--to-file=ТЕКА2 Упореди све операнте са ТЕКА2. ТЕКА2 може бири директоријум." -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Занемари словну величину у склопу датотека." -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Занемари промене услед развијања табулатора." -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Занемари сву белину." -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Занемари промене због количине белине." -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Занемари сву белину." -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Занемари промене услед празних редова." -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I РИ --ignore-matching-lines=РИ Занемари промене чији редови поклапају РИ." -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Прихвати све датотеке као текст." -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Оголи пратеће <CR> на улазу." -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Читај и пиши податке у бинарном режиму." -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "-D ИМЕ --ifdef=ИМЕ Испиши „#ifdef ИМЕ“ разлике спојене датотеке." -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=ГОБЛ Слично, али обликуј GTYPE улазне групе са ГОБЛ." -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=РОБЛ Слично, али обликуј све улазне редове са РОБЛ." -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=РОБЛ Слично, али обликуј LTYPE улазне редове са РОБЛ." -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE је `old', `new', или `unchanged'. GTYPE је LTYPE или `changed'." -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -954,7 +959,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -967,7 +972,7 @@ msgstr "" " %l садржај реда, изузев пратећих знакова за нови ред\n" " %[-][ШИРН][.[ТАЧН]]{doxX}n printf-стил за улазни број реда" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -981,94 +986,102 @@ msgstr "" " %c'З' само један знак „З“\n" " %c'\\OOO' знак са окталним кодом OOO" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Потруди се да нађеш мањи скуп промена." -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=БРЈ Чувај БРЈ редова заједничког префикса и суфикса." -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" "-H --speed-large-files За велике датотеке за много раштрканих малих измена." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Извести о верзији." -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "ДАТОТЕКЕ су „ТЕКА1 ТЕКА2“ или „ДИР1 ДИР2“ или „ДИР ТЕКА...“ или „ТЕКА... " "ДИР“." -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Нема ограничења за ДАТОТЕКЕ ако је „--from-file“ или „--to-file“ задато." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "Ако је ДАТОТЕКА „-“, читај стандардни улаз." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Употреба: %s [ОПЦИЈА]... ДАТОТЕКЕ\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "Поређење датотека ред по ред." -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "сукоб због вредности „%s“ опције „%s“" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "сукобљене опције излазног стила" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Само у %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "не може поредити „-“ са директоријумом" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "опција „-D“ није подржана за директоријуме" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Заједнички поддиректоријуми: %s и %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Датотека „%s“ је „%s“ док је датотека „%s“ „%s“\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Датотеке %s и %s различите\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Датотеке „%s“ и „%s“ се подударају\n" @@ -1084,11 +1097,12 @@ msgid "incompatible options" msgstr "несагласне опције" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "„-“ наведено за више од једне датотеке" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "неуспело читање" @@ -1124,13 +1138,12 @@ msgid "" msgstr "-x --overlap-only Испиши преклопљене промене." #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap Испиши неспојене промене, означи заградама сукобе." +msgstr "" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Придодај „w“ и „q“ наредбе ed списима." #: src/diff3.c:438 @@ -1166,9 +1179,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Прихвати све датотеке као текст." +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1219,30 +1231,30 @@ msgstr "интерна грешка: неисправна „diff“ врста msgid "invalid diff format; invalid change separator" msgstr "неисправан diff облик; неважећи раздвојник измена" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "неисправан diff облик; непотпун задњи ред" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "помоћни програм „%s“ није могао бити покренут" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "неисправан diff облик; нетачни водећи знакови реда" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "унутрашња грешка: неисправан diff тип прослеђен излазу" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "улазна датотека се скупила" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "не може поредити имена датотека „%s“ и „%s“" #: src/dir.c:209 @@ -1255,130 +1267,135 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o ТЕКА --output=ТЕКА Интерактивни рад, излаз се шаље у ТЕКА." -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case Сматрај велика и мала слова истим." -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Занемари промене услед развијања табулатора." -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Занемари сву белину." -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Занемари промене због количине белине." -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Занемари сву белину." +msgstr "-W --ignore-all-space Занемари све размаке." -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines Занемари промене услед празних редова." -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I РИ --ignore-matching-lines=РИ Занемари промене чији редови поклапају РИ." + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Оголи пратеће <CR> на улазу." -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Прихвати све датотеке као текст." -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w БРЈ --width=БРЈ Ширина излаза је највише БРЈ (почетно 130) колона." -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column Испиши само леву колону заједничких редова." -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Не приказуј заједничке редове." -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Развиј табулаторе у размаке за излаз." -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=БРЈ Величина табулатора је БРЈ (почетно 8) колона." -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Потруди се да нађеш мањи скуп промена." -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" "-H --speed-large-files За велике датотеке за много раштрканих малих измена." -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=ПРОГРАМ Користи ПРОГРАМ за поређење датотека." -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Прихвати све датотеке као текст." +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Извести о верзији." -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Употреба: %s [ОПЦИЈА]... ДАТОТЕКА1 ДАТОТЕКА22\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Упоредно стапање разлика датотека" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "не може интерактивно уклопити стандардни улаз" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "обе датотеке за поређење су директоријуми" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1403,56 +1420,45 @@ msgstr "" "v:\tУметни заједничке редове бучно.\n" "q:\tЗаврши.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: неправилна опција -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Ово је слободан софтвер; видети изворни кôд за услове умножавања. Без " +#~ "ИКАКВЕ\n" +#~ "гаранције; чак ни за ТРЖИШНОСТ или ПРИКЛАДНОСТ ОДРЕЂЕНОЈ СВРСИ.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i БРОЈ1:БРОЈ2 --ignore-initial=БРОЈ1:БРОЈ2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent Без исписа; пријави само излазно стање." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Извести о верзији." - #~ msgid "--help Output this help." #~ msgstr "--help Испиши ово објашњење." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Поређење три датотеке ред по ред." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." #~ msgstr "" -#~ "-E --ignore-tab-expansion Занемари промене услед развијања табулатора." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change Занемари промене због количине белине." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Занемари све размаке." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines Занемари промене услед празних редова." +#~ "Пријава грешака на адресу <bug-gnu-utils@gnu.org>.\n" +#~ "Поруке у вези превода слати на <gnu@prevod.org>." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Оголи пратеће <CR> на улазу." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "опција „-%ld“ је застарела; користити „-%c %ld“" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Прихвати све датотеке као текст." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "опција „-%ld“ је застарела; изоставите је" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1464,10 +1470,6 @@ msgstr "" #~ " -p --show-c-function Прикажи Це функцију у којој је промена.\n" #~ " -F РИ --show-function-line=РИ Прикажи најскорији ред који РИ поклапа." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Излаз је „ed“ спис." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1479,31 +1481,11 @@ msgstr "" #~ " --left-column Испис само леве колоне код заједничких редова.\n" #~ " --suppress-common-lines Не исписуј заједничке редове." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Развиј табулаторе у размаке за излаз." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab Поравнај табулаторе додајући један табулатор." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=БРЈ Величина табулатора је БРЈ (почетно 8) колона." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Потруди се да нађеш мањи скуп промена." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files За велике датотеке са много раштрканих малих промена." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all Испиши све промене, означи заградама сукобе." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X Испиши и означи заградама преклопљене промене." @@ -1513,78 +1495,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L ОЗНКА --label=ОЗНКА Користи ОЗНКА уместо имена датотеке." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=ПРОГРАМ Користи ПРОГРАМ за поређење датотека." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Занемари све размаке." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w БРЈ --width=БРЈ Ширина излаза је највише БРЈ (почетно 130) колона." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Испиши само леву колону заједничких редова." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files За велике датотеке са много раштрканих малих промена." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "неуспело читање" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "записивање неуспешано" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "неуспело читање" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "неуспело читање" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "записивање неуспешано" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "записивање неуспешано" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: неправилна опција -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Ово је слободан софтвер; видети изворни кôд за услове умножавања. Без " -#~ "ИКАКВЕ\n" -#~ "гаранције; чак ни за ТРЖИШНОСТ или ПРИКЛАДНОСТ ОДРЕЂЕНОЈ СВРСИ.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "" -#~ "Пријава грешака на адресу <bug-gnu-utils@gnu.org>.\n" -#~ "Поруке у вези превода слати на <gnu@prevod.org>." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "опција „-%ld“ је застарела; користити „-%c %ld“" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "опција „-%ld“ је застарела; изоставите је" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "помоћни програм „%s“ није нађен" @@ -1,16 +1,16 @@ # Swedish messages for diffutils. -# Copyright © 1996, 2001, 2002, 2004, 2006, 2010, 2011 Free Software Foundation, Inc. +# Copyright © 1996, 2001, 2002, 2004, 2006, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# Göran Uddeborg <goeran@uddeborg.se>, 1996, 2001, 2002, 2004, 2006, 2010, 2011. +# Göran Uddeborg <goeran@uddeborg.se>, 1996, 2001, 2002, 2004, 2006, 2010, 2011, 2012. # -# $Revision: 1.39 $ +# $Revision: 1.43 $ # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.1\n" +"Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-08-24 23:10+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-10-31 21:15+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -26,7 +26,7 @@ msgstr "programfel" msgid "stack overflow" msgstr "stackspill" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Okänt systemfel" @@ -139,100 +139,102 @@ msgstr "%s: flaggan \"-W %s\" behöver ett argument\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "”" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "”" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Lyckades" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Ingen match" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Ogiltigt reguljäruttryck" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ogiltigt sorteringstecken" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Ogiltigt namn på teckenklass" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Avslutande omvänt snedstreck" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Ogiltig bakåtreferens" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Oparad [ eller [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Oparad ( eller \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Oparad \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Ogiltigt innehåll i \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Ogiltigt intervallslut" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Minnet slut" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Föregående reguljäruttryck ogiltigt" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Förtida slut på reguljäruttryck" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "För stort reguljäruttryck" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Oparad ) eller \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Inget föregående reguljäruttryck" @@ -263,18 +265,18 @@ msgstr "kunde inte öppna om %s i läge %s" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" -msgstr "ogiltigt argument till %s%s \"%s\"" +msgid "invalid %s%s argument '%s'" +msgstr "ogiltigt argument till %s%s ”%s”" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "ogiltigt suffix i argument till %s%s \"%s\"" +msgid "invalid suffix in %s%s argument '%s'" +msgstr "ogiltigt suffix i argument till %s%s ”%s”" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" -msgstr "argument till %s%s \"%s\" för stort" +msgid "%s%s argument '%s' too large" +msgstr "argument till %s%s ”%s” är för stort" #: lib/version-etc.c:74 #, c-format @@ -451,7 +453,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Allmän hjälp med att använda GNU-program: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Filerna %s och %s skiljer\n" @@ -461,7 +463,7 @@ msgstr "Filerna %s och %s skiljer\n" msgid "Binary files %s and %s differ\n" msgstr "De binära filerna %s och %s skiljer\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Ingen nyrad vid filslut" @@ -475,29 +477,29 @@ msgstr "Torbjörn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Försök med \"%s --help\" för mer information." +msgid "Try '%s --help' for more information." +msgstr "Försök med ”%s --help” för mer information." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "ogiltigt --ignore-initial-värde \"%s\"" +msgid "invalid --ignore-initial value '%s'" +msgstr "ogiltigt --ignore-initial-värde ”%s”" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "flaggorna -l och -s är motstridiga" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "skrivning misslyckades" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standard ut" @@ -559,7 +561,7 @@ msgstr "" "De valfria HOPP1 och HOPP2 anger antalet antalet byte att hoppa över\n" "i början varje fil (noll som standard)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -577,27 +579,27 @@ msgstr "" "GB 1 000 000 000, G 1 073 741 824, och så vidare för T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Om FIL är \"-\" eller utelämnats, läs standard in." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Om FIL är ”-” eller utelämnats, läs standard in." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Slutsstatus är 0 om indata är lika, 1 om olika, 2 vid problem." #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "ogiltigt --bytes-värde \"%s\"" +msgid "invalid --bytes value '%s'" +msgstr "ogiltigt --bytes-värde ”%s”" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "saknad operand efter \"%s\"" +msgid "missing operand after '%s'" +msgstr "saknad operand efter ”%s”" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "extra operand \"%s\"" +msgid "extra operand '%s'" +msgstr "extra operand ”%s”" #: src/cmp.c:491 #, c-format @@ -615,136 +617,136 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: EOF i %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "ogiltig omgivningslängd \"%s\"" +msgid "invalid context length '%s'" +msgstr "ogiltig omgivningslängd ”%s”" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "sidvisning stödjs ej på denna värd" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "för många etikettflaggor" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "ogiltig bredd \"%s\"" +msgid "invalid width '%s'" +msgstr "ogiltig bredd ”%s”" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "konflikt mellan breddflaggor" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "ogiltig horisontlängd \"%s\"" +msgid "invalid horizon length '%s'" +msgstr "ogiltig horisontlängd ”%s”" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "ogiltigt tabulatorsteg \"%s\"" +msgid "invalid tabsize '%s'" +msgstr "ogiltigt tabulatorsteg ”%s”" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "konflikt mellan tabulatorflaggor" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "både --from-file och --to-file angavs" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr " --normal skriv ut en normal diff (standard)" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "-q, --brief rapportera endast när filer skiljer sig" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files rapportera om två filer är lika" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C ANT, --context[=ANT] skriv ANT (3 som standard) rader kopia av " "sammanhang" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U ANT, --unified[=ANT] skriv ut ANT (3 som standard) rader med\n" " sammanslagen omgivning" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "-e, --ed skriv ut ett ed-skript" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs skriv ut skillnader i RCS-format" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side skriv ut i två kolumner" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ANT skriv ut högst ANT (130 som standard) kolumner" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column skriv ut endast vänstra kolumnen av gemensamma " "rader" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines skriv inte ut gemensamma rader" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function visa vilken C-funktion varje rad finns i" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RU visa dn senaste raden som matchar RU" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" @@ -752,23 +754,23 @@ msgstr "" " --label ETIKETT använd ETIKETT istället för filnamn\n" " (kan upprepas)" -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs expandera tabulatorer till blanksteg i utdata" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab justera tabulatorer genom att skjuta in en" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=N tabulatorstopp var N:e (8 som standard) kolumn" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" @@ -776,50 +778,54 @@ msgstr "" "tomma\n" " utrader" -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l, --paginate skicka utdata till ”pr” för paginering" -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive jämför underkataloger som hittas rekursivt" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference följ inte symboliska länkar" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file behandla saknade filer som tomma" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file behandla saknade förstafiler som tomma" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case bortse från skiftläge när filnamn jämförs" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case ta hänsyn till skiftläge när filnamn jämförs" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=MNS ta inte med filer som matchar MNS" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FIL uteslut filer som matchar något mönster i FIL" -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S, --starting-file=FIL börja med FIL när kataloger jämförs" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -827,7 +833,7 @@ msgstr "" " --from-file=FIL1 jämför FIL1 med alla operander;\n" " FIL1 kan vara en katalog" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -835,79 +841,79 @@ msgstr "" " --to-file=FIL2 jämför alla operander med FIL2;\n" " FIL2 kan vara en katalog" -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case bortse från skillnader i skiftläge i " "filinnehåll" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion bortse från ändringar på grund av tab-" "expansion" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space ignorera alla blanktecken" +msgstr "" +"-Z, --ignore-trailing-space ignorera alla blanktecken i slutet av raden" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change bortse från ändringar i antalet blanka" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space bortse från alla blanktecken" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B, --ignore-blank-lines bortse från ändringar där alla rader är " +"-B, --ignore-blank-lines bortse från ändringar där raderna är helt " "blanka" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I, --ignore-matching-lines=RU bortse från ändringar vars rader alla " -"matchar RU" +"-I, --ignore-matching-lines=RU bortse från ändringar där alla rader matchar " +"RU" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "-a, --text behandla alla filer som text" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr tag bort avslutande vagnreturer i indata" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr " --binary läs och skriv data binärt" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAMN skriv sammanslagen fil med skillnader inom\n" " ”#ifdef NAMN”" -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYP-group-format=GFMT formatera GTYP-ingrupper med GFMT" -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=RFMT formatera alla inrader med RFMT" -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --RTYP-line-format=RFMT formatera RTYP-inrader med RFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -915,13 +921,12 @@ msgstr "" " Dessa formatflagger gör det möjligt att finjustera utskriften från\n" " diff, generaliserande -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" RTYP är \"old\", \"new\" eller \"unchanged\". GTYP är RTYP eller \"changed" -"\"." +" LTYP är ”old”, ”new” eller ”unchanged”. GTYP är LTYP eller ”changed”." -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -949,7 +954,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) om A är lika med B då T annars E" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -961,7 +966,7 @@ msgstr "" " %l radinnehåll exklusive avslutande nyrad\n" " %[-][BREDD][.[PREC]]{doxX}n printf-stil spec. för inradnummer" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -975,91 +980,95 @@ msgstr "" " %c'\\OOO' tecknet med oktalkod OOO\n" " T tecknet T (övriga tecken representerar sig själva)" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal arbeta hårt för att hitta en mindre mängd av " "ändringar" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ANT spara ANT rader av gemensamt prefix och suffix" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " --speed-large-files antag stora filer och små spridda ändringar" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr " --help visa denna hjälp och avsluta" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "-v, --version visa versionsinformation och avsluta" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"FILER är \"FIL1 FIL2\" eller \"KAT1 KAT2\" eller \"KAT FIL...\" eller " -"\"FIL... KAT\"." +"FILER är ”FIL1 FIL2” eller ”KAT1 KAT2” eller \"KAT FIL…” eller ”FIL… KAT”." -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Om --from-file eller --to-file är angivet finns det inga begränsningar\n" "på FILER." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Om en FIL är \"-\", läs standard in." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Om en FIL är ”-”, läs standard in." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Användning: %s [FLAGGA]... FILER\n" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Jämför FILER rad för rad." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "motstridigt %s-flaggsvärde \"%s\"" +msgid "conflicting %s option value '%s'" +msgstr "motstridigt %s-flaggsvärde ”%s”" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "motstridig utmatningsstilsflagga" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Endast i %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "kan inte jämföra \"-\" med en katalog" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "kan inte jämföra ”-” med en katalog" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D flaggan stödjs ej för kataloger" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Lika underkataloger: %s och %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Filen %s är %s medan filen %s är %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "De symboliska länkarna %s och %s skiljer\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Filerna %s och %s är lika\n" @@ -1075,11 +1084,11 @@ msgid "incompatible options" msgstr "oförenliga flaggor" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "\"-\" angivet för mer än en infil" +msgid "'-' specified for more than one input file" +msgstr "”-” angivet för mer än en infil" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "läsning misslyckades" @@ -1121,7 +1130,7 @@ msgid "-X like -x, but bracket conflicts" msgstr "-X som -x, men skriv klamrar om konflikter" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i lägg till ”w”- och ”q”-kommandon till ed-skript" @@ -1223,31 +1232,31 @@ msgstr "internt fel: ogiltig diff-typ i process_diff" msgid "invalid diff format; invalid change separator" msgstr "ogiltigt diff-format; ogiltig ändringsseparator" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "ogiltigt diff-format; ofullständig sista rad" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "underprogram \"%s\" kunde inte startas" +msgid "subsidiary program '%s' could not be invoked" +msgstr "underprogram ”%s” kunde inte startas" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "ogiltigt diff-format; felaktiga starttecken på rad" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "internt fel: ogiltig diff-typ utskickad" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "infilen krympte" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "kan inte jämföra filnamnen \"%s\" och \"%s\"" +msgid "cannot compare file names '%s' and '%s'" +msgstr "kan inte jämföra filnamnen ”%s” och ”%s”" #: src/dir.c:209 #, c-format @@ -1259,119 +1268,125 @@ msgstr "%s: rekursiv katalogslinga" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o, --output=FIL kör interaktivt, med utdata till FIL" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i, --ignore-case betrakta versaler och gemena som lika" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignorera ändringar på grund av " "tabulatorexpansion" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W, --ignore-all-space ignorera alla blanktecken" +msgstr "" +"-Z, --ignore-trailing-space ignorera alla blanktecken i slutet av raden" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change ignorera ändringar i antalet blanka" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W, --ignore-all-space ignorera alla blanktecken" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B, --ignore-blank-lines ignorera ändringar i form av enbart blanka rader" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RU bortse från ändringar vars alla rader " +"matchar RU" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr tag bort avslutande vagnreturer i indata" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "-a, --text behandla alla filer som text" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=ANT skriv ut högst ANT (130 som standard) kolumner" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l, --left-column skriv ut endast ut gemensamma raders vänstra " "kolumn" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s, --suppress-common-lines skriv inte ut gemensamma rader" -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs expandera tabulatorer till blanksteg i utdata" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" " --tabsize=N tabulatorstopp var N:e (8 som standard) kolumn" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal arbeta hårt för att hitta en mindre mängd " "ändringar" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" "-H, --speed-large-files antag stora filer och små spridda ändringar" -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM använd PROGRAM för att jämföra filer" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr " --help visa denna hjälp och avsluta" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "-v, --version visa versionsinformation och avsluta" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Användning: %s [FLAGGA]... FIL1 FIL2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Sammanslagning sida-vid-sida av skillnader mellan FIL1 och FIL2." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "kan inte slå samman standard in interaktivt" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "båda filerna som skall jämföras är kataloger" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" Binary files differ@@ -1,21 +1,24 @@ -# translation of diffutils-2.8.7.tr.po to Turkish +# translation of diffutils-3.3-pre1.tr.po to Turkish # Diffutils Turkish translation # Copyright (C) 2001, 2005 Free Software Foundation, Inc. -# Deniz Akkus Kanca <deniz@arayan.com>, 2001. # +# This file is distributed under the same license as the diffutils package. +# Deniz Akkus Kanca <deniz@arayan.com>, 2001. +# Volkan Gezer <vlkngzr@gmail.com>, 2013. msgid "" msgstr "" -"Project-Id-Version: diffutils 2.8.7\n" +"Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2005-03-14 04:19+0200\n" -"Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2013-03-09 15:49+0100\n" +"Last-Translator: Volkan Gezer <vlkngzr@gmail.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: Lokalize 1.5\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: lib/c-stack.c:204 lib/c-stack.c:297 msgid "program error" @@ -25,7 +28,7 @@ msgstr "yazılım hatası" msgid "stack overflow" msgstr "yığıt taşması" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" @@ -82,156 +85,158 @@ msgid "weird file" msgstr "dosya garip" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: `%s' seçeneği belirsiz\n" +msgstr "%s: `%s' seçeneği belirsiz; kullanılabilecekler:" #: lib/getopt.c:624 lib/getopt.c:628 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneği argümansız kullanılır\n" #: lib/getopt.c:637 lib/getopt.c:642 -#, fuzzy, c-format +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: seçenek `%c%s' argümansız kullanılır\n" #: lib/getopt.c:685 lib/getopt.c:704 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" #: lib/getopt.c:742 lib/getopt.c:745 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: `--%s' seçeneği bilinmiyor\n" #: lib/getopt.c:753 lib/getopt.c:756 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: `%c%s' seçeneği bilinmiyor\n" #: lib/getopt.c:805 lib/getopt.c:808 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: geçersiz seçenek -- %c\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: seçenek bir argümanla kullanılır -- %c\n" #: lib/getopt.c:934 lib/getopt.c:950 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneği belirsiz\n" #: lib/getopt.c:974 lib/getopt.c:992 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n" #: lib/getopt.c:1013 lib/getopt.c:1031 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" -msgstr "" +msgstr "`" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" -msgstr "" +msgstr "'" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Başarılı" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Eşleme yok" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Düzenli ifade geçersiz" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Harmanlama karakteri geçersiz" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Karakter sınıf ismi geçersiz" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "İzleyen ters kesme" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Geriye başvuru geçersiz" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "[ ya da [^ eşleşmiyor" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "( ya da \\( eşleşmiyor" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "\\{ eşleşmiyor" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} içeriği geçersiz" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Kapsam sonu geçersiz" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Bellek tükendi" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Önceki düzenli ifade geçersiz" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Düzenli ifadenin sonu eksik kalmış" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Düzenli ifade çok büyük" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr ") ya da \\) eşleşmiyor" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Daha önce düzenli ifade yok" @@ -241,57 +246,56 @@ msgstr "bellek tükendi" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "stdin" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "stdout" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "stderr" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "Bilinmeyen sistem hatası" +msgstr "bilinmeyen akış" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" -msgstr "" +msgstr "%s, %s kipinde yeniden açılamadı" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format -msgid "invalid %s%s argument `%s'" -msgstr "geçersiz --bytes değeri `%s'" +#, c-format +msgid "invalid %s%s argument '%s'" +msgstr "Geçersiz %s%s argümanı '%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "geçersiz ufuk uzunluğu `%s'" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "%s%s içinde '%s' argümanı için geçersiz son ek" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" -msgstr "" +msgid "%s%s argument '%s' too large" +msgstr "%s%s argümanı '%s' çok uzun" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "%s (%s) tarafından paketlenmiş\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "%s tarafından paketlenmiş\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "" +msgstr "(C)" #: lib/version-etc.c:86 msgid "" @@ -302,6 +306,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Lisans GPLv3+: GNU GPL sürüm 3 veya sonrası <http://gnu.org/licenses/gpl." +"html>.\n" +"Bu ücretsiz bir yazılımdır: değiştirmekte ve tekrar dağıtmakta özgürsünüz.\n" +"İzin verilen yasalar kapsamında hiçbir GARANTİSİ BULUNMAMAKTADIR.\n" +"\n" # TRANSLATORS: %s denotes an author name. #. TRANSLATORS: %s denotes an author name. @@ -448,37 +458,40 @@ msgid "" "\n" "Report bugs to: %s\n" msgstr "" +"\n" +"Hataları şuraya bildirin: %s\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "" +msgstr "%s hatalarını şuraya bildirin: %s\n" #: lib/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "%s ana sayfası: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -msgstr "" +msgstr "%s ana sayfası: <http://www.gnu.org/software/%s/>\n" #: lib/version-etc.c:256 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" +"GNU yazılımı kullanımı hakkında genel yardım: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "%s ve %s dosyaları birbirinden farklı\n" #: src/analyze.c:462 -#, fuzzy, c-format +#, c-format msgid "Binary files %s and %s differ\n" -msgstr "%s ve %s dosyaları birbirinden farklı\n" +msgstr "İkili %s ve %s birbirinden farklı\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Dosya sonunda yenisatır yok." @@ -490,75 +503,73 @@ msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:44 msgid "David MacKenzie" -msgstr "" +msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Daha fazla bilgi için `%s --help' komutunu kullanın." +msgid "Try '%s --help' for more information." +msgstr "Daha fazla bilgi için `%s --help' komutunu deneyin." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "geçersiz -- ilk değer `%s' yoksayılmış" +msgid "invalid --ignore-initial value '%s'" +msgstr "geçersiz --ignore-initial değeri '%s'" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "-l ve -s seçenekleri beraber kullanılamaz" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "yazma başarısız oldu" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "standart çıktı" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes Bayt farklarını çıktılar." +msgstr "-b, --print-bytes bayt farklarını çıktılar" #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" -msgstr "-i ATLA --ignore-initial=ATLA Girdinin ilk ATLA baytını atlar." +msgstr "" +"-i, --ignore-initial=ATLA İki girdinin de ilk ATLA baytını atlar." #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" -msgstr " DOSYA1'in ilk ATLA1 baytını ve DOSYA2'nin ilk ATLA2 baytını atlar." +msgstr "" +"-i, --ignore-initial=ATLA1:ATLA2 DOSYA1'in ilk ATLA1 baytını ve\n" +" DOSYA2'nin ilk ATLA2 baytını atlar" #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" -"-l --verbose Bütün farklı baytların numaralarını ve değerlerini gösterir." +"-l, --verbose bütün farklı baytların numaralarını ve " +"değerlerini göster" #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n LİMİT --bytes=LİMİT En fazla LİMİT baytı karşılaştırır." +msgstr "-n, --bytes=LİMİT en fazla LİMİT baytı karşılaştırır" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent tüm normal çıktıları gizle" #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help bu yardım metnini göster ve çık" #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Sürüm bilgisini gösterir." +msgstr "-v, --version sürüm bilgisini gösterir" #: src/cmp.c:178 #, c-format @@ -570,16 +581,19 @@ msgid "Compare two files byte by byte." msgstr "İki dosyayı bayt bayt karşılaştırır." #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." -msgstr "ATLA1 ve ATLA2 her dosyada atlanacak bayt sayısını gösterir." +msgstr "" +"İsteğe bağlı ATLA1 ve ATLA2, her dosyanın başından atlanacak\n" +"(öntanımlı olarak sıfır) bayt sayısını belirtir." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"Uzun seçenekler için zorunlu olan argümanlar, kısa seçenekler için de " +"zorunludur.\n" #: src/cmp.c:191 msgid "" @@ -592,26 +606,26 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, ve T, P, E, Z, Y için devam eder." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +msgid "If a FILE is '-' or missing, read standard input." msgstr "Eğer DOSYA `-' ise veya yoksa, standart girdi okunur." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Girdiler aynı ise çıkış durumu 0, farklı ise 1, sorun var ise 2 olur." #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" +msgid "invalid --bytes value '%s'" msgstr "geçersiz --bytes değeri `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" +msgid "missing operand after '%s'" msgstr "`%s'den sonra işlenen eksik" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" +msgid "extra operand '%s'" msgstr "fazla işlenen `%s'" #: src/cmp.c:491 @@ -630,354 +644,330 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: %s'da EOF (dosyasonu)\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" -msgstr "" +msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" -msgstr "" +msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" -msgstr "" +msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" -msgstr "" +msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" -msgstr "" +msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "`%s' içerik uzunluğu geçersiz" +msgid "invalid context length '%s'" +msgstr "`%s' bağlam uzunluğu geçersiz" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "sayfalama bu makina üzerinde desteklenmiyor" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "çok fazla dosya etiket seçeneği" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" +msgid "invalid width '%s'" msgstr "geçersiz genişlik `%s'" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "çelişkili genişlik seçenekleri" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" +msgid "invalid horizon length '%s'" msgstr "geçersiz ufuk uzunluğu `%s'" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "geçersiz genişlik `%s'" +msgid "invalid tabsize '%s'" +msgstr "geçersiz sekme genişliği `%s'" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "çelişkili genişlik seçenekleri" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "hem --from-file hem de --to-file belirtilmiş" -#: src/diff.c:851 -#, fuzzy +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" -msgstr "--normal Normal bir diff çıktılar." +msgstr " --normal normal bir diff çıktılar (öntanımlı)" -#: src/diff.c:852 -#, fuzzy +#: src/diff.c:855 msgid "-q, --brief report only when files differ" -msgstr "-q --brief Yalnızca dosyaların farklı olup olmadığını gösterir." +msgstr "-q, --brief yalnızca dosyalar farklı ise göster" -#: src/diff.c:853 -#, fuzzy +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "" -"-s --report-identical-files iki dosyanın birbirinin aynısı olup " -"olmadığını\n" -" bildirir." +"-s, --report-identical-files iki dosyanın birbirinin aynısı ise göster" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w SAYI --width=SAYI Satır başına en fazla SAYI kadar karakter çıktılar\n" -" (öntanımlı 130)." +"-c, -C SAYI, --context[=SAYI] kopyalanan bağlamı SAYI satırınca (öntanımlı " +"3) bastırır" -#: src/diff.c:855 -#, fuzzy +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-w SAYI --width=SAYI Satır başına en fazla SAYI kadar karakter çıktılar\n" -" (öntanımlı 130)." +"-u, -U SAYI, --unified[=SAYI] birleşik bağlamın SAYI (öntanımlı 3) " +"satırınca çıktı gösterir" -#: src/diff.c:856 -#, fuzzy +#: src/diff.c:859 msgid "-e, --ed output an ed script" -msgstr "-a --text Bütün dosyaları metin imişcesine işler." +msgstr "-e, --ed bir ed betiği çıktılar" -#: src/diff.c:857 -#, fuzzy +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs RCS biçeminde diff çıktılar." +msgstr "-n, --rcs RCS biçeminde diff çıktılar" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Sürüm bilgisini gösterir." +msgstr "-y, --side-by-side iki sütunda çıktı göster" -#: src/diff.c:859 -#, fuzzy +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w SAYI --width=SAYI Satır başına en fazla SAYI kadar karakter çıktılar\n" -" (öntanımlı 130)." +"-W, --width=SAYI satır başına en fazla SAYI kadar karakter " +"çıktılar (öntanımlı 130)" -#: src/diff.c:860 -#, fuzzy +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column Ortak satırları yalnızca sol sütunda çıktılar." +msgstr "" +" --left-column ortak satırları yalnızca sol sütunda çıktılar" -#: src/diff.c:861 -#, fuzzy +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Ortak satırları göstermez." +msgstr " --suppress-common-lines ortak satırlayı gösterme" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" -msgstr "" +msgstr "-p, --show-c-function içinde değişen her C işlevini göster" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" +"-F, --show-function-line=DÜZİF DÜZİF ile eşleşen en yakın satırı göster" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" +" --label ETİKET dosya adı yerine ETİKET kullan\n" +" (tekrarlanabilir)" -#: src/diff.c:868 -#, fuzzy +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs Çıktıda sekmeleri boşluk haline getirir." +msgstr "-t, --expand-tabs çıktıda sekmeleri boşluk haline getir" -#: src/diff.c:869 -#, fuzzy +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Başlarına bir sekme ilave ederek sekmelerin " -"hizalanmasını\n" -" sağlar." +"-T, --initial-tab başlarına bir sekme ilave ederek sekmelerin " +"hizalanmasını sağla" -#: src/diff.c:870 -#, fuzzy +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -"--tabsize=SAYI Sekmeler SAYI sütun genişliğine (öntanımlı 8) ayarlanır." +" --tabsize=SAYI sekmeler SAYI sütun genişliğine (öntanımlı 8) " +"ayarlanır." -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" +" --suppress-blank-empty boş çıktı satırlarından önce boşluk veya " +"sekmeyi gözardı et" -#: src/diff.c:872 -#, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" -msgstr "-l --paginate Çıktıyı `pr' komutundan geçirerek sayfalar." +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "" +"-l, --paginate çıktıyı 'pr' komutundan geçirerek sayfala" -#: src/diff.c:874 -#, fuzzy +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" -"-r --recursive Çevrimli olarak bulunan bütün alt dizinleri karşılaştırır." +"-r, --recursive çevrimli olarak bulunan bütün alt dizinleri " +"karşılaştır" -#: src/diff.c:875 -#, fuzzy +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference sembolik bağlantıları takip etme" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file Var olmayan dosyaları boş varsayar." +msgstr "-N, --new-file var olmayan dosyaları boş varsay" -#: src/diff.c:876 -#, fuzzy +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" -msgstr "--unidirectional-new-file Var olmayan birinci dosyayı boş varsayar." +msgstr " --unidirectional-new-file var olmayan birinci dosyayı boş varsay" -#: src/diff.c:877 -#, fuzzy +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -"--ignore-file-name-case Dosya isimlerinde büyük/küçük harf farklarını " -"yoksayar." +" --ignore-file-name-case dosya isimlerinde büyük/küçük harf " +"farklarını yoksay" -#: src/diff.c:878 -#, fuzzy +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -"--no-ignore-file-name-case Dosya isimlerinde büyük/küçük harf farkı gözetir." +" --no-ignore-file-name-case dosya isimlerinde büyük/küçük harf farkını " +"göz önüne al" -#: src/diff.c:879 -#, fuzzy +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" -msgstr "-x KALIP --exclude=KALIP KALIP'a uyan dosyaları işleme dahil etmez." +msgstr "" +"-x, --exclude=KALIP KALIP'a uyan dosyaları işleme dahil etme" -#: src/diff.c:880 -#, fuzzy +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X DOSYA --exclude-from=DOSYA DOSYA'da bulunan kalıplara uyan dosyaları\n" -" işlem dışı tutar." +"-X, --exclude-from=DOSYA DOSYA'da bulunan kalıplara uyan dosyaları " +"işlem dışı tut" -#: src/diff.c:881 -#, fuzzy +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -"-S DOSYA --starting-file=DOSYA Dizinleri karşılaştırırken DOSYA'dan başlar." +"-S, --starting-file=DOSYA dizinleri karşılaştırırken DOSYA'dan başla" -#: src/diff.c:882 -#, fuzzy +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=DOSYA1 DOSYA1'i bütün işlenenlerle karşılaştırır. DOSYA1 dizin\n" -" olabilir." +" --from-file=DOSYA1 DOSYA1'i bütün işlenenlerle karşılaştır;\n" +" DOSYA1 bir dizin olabilir" -#: src/diff.c:884 -#, fuzzy +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=DOSYA2 Bütün işlenenleri DOSYA2 ile karşılaştırı. DOSYA2 dizin\n" -" olabilir." +" --to-file=DOSYA2 DOSYA2'yi bütün işlenenlerle karşılaştır;\n" +" DOSYA2 bir dizin olabilir" -#: src/diff.c:887 -#, fuzzy +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -"-i --ignore-case Dosya içeriğinde büyük/küçük harf farklarını yoksayar." +"-i, --ignore-case dosya içeriğinde büyük/küçük harf farklarını " +"yoksay" -#: src/diff.c:888 -#, fuzzy +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Sekmelerin açılmasından doğan farkları yoksayar." +"-E, --ignore-tab-expansion sekmelerin açılmasından doğan farkları yoksay" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Bütün boşlukları yoksayar." +msgstr "-Z, --ignore-trailing-space bütün satır sonu boşluklarını yoksay" -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -"-b --ignore-space-change Boşluk miktarındaki değişiklikleri yoksayar." +"-b, --ignore-space-change boşluk miktarındaki değişiklikleri yoksay" -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Bütün boşlukları yoksayar." +msgstr "-w, --ignore-all-space bütün boşlukları yoksay" -#: src/diff.c:892 -#, fuzzy +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B --ignore-blank-lines Satırları boş olan değişiklikleri dikkate almaz." +"-B, --ignore-blank-lines satırları boş olan değişiklikleri dikkate " +"alma" -#: src/diff.c:893 src/sdiff.c:178 -#, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I DÜZİF --ignore-matching-lines=DÜZİF Satırları DÜZİF kalıbına uyan\n" -" farkları yok sayar." +"-I, --ignore-matching-lines=DÜZİF satırları DÜZİF kalıbına uyan farkları " +"yok say" -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:899 msgid "-a, --text treat all files as text" -msgstr "-a --text Bütün dosyaları metin imişcesine işler." +msgstr "-a, --text bütün dosyaları metin olarak işle" -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr Girdiden en sonda sarkan satır başını soyar." +msgstr "" +" --strip-trailing-cr girdiden en sonda sarkan satır başını soy" -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:902 msgid " --binary read and write data in binary mode" -msgstr "--binary Datayı ikilik kipte yazar ve okur." +msgstr " --binary veriyi ikilik kipte yaz ve oku" -#: src/diff.c:901 -#, fuzzy +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D İSİM --ifdef=İSİM #ifdef İSİM farklarını gösteren harmanlanmış\n" -" dosya çıktılar." +"-D, --ifdef=İSİM '#ifdef İSİM' farklarını gösteren " +"harmanlanmış dosya çıktıla." -#: src/diff.c:902 -#, fuzzy +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -"--GTÜR-group-format=GBÇ Benzer, fakat GTÜR biçeminde girdi grupları\n" -" GBÇ ile biçemlendirilir." +" --GTYPE-group-format=GFMT GTYPE girdi gruplarını GFMT ile biçimlendir" -#: src/diff.c:903 -#, fuzzy +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -"--line-format=LBÇ Benzer, fakat bütün girdi satırları LBÇ ile " -"biçemlendirilir." +" --line-format=LFMT tüm girdi satırlarını LFMT ile biçimlendir" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -"--LTÜR-line-format=LBÇ Benzer, fakat LTÜR girdi satırları \n" -" LBÇ ile biçemlendirilir." +" --LTYPE-line-format=LFMT tüm LTYPE girdi satırlarını LFMT ile " +"biçimlendir" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +" Bu biçimlendirme seçenekleri çıktı veya fark üzerinde iyileştirilmiş fine-" +"grained control over the output\n" +" tanecik denetimi sağlar. -D/--ifdef genelleştirmesi yapar." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTÜR, `old' (eski), `new' (yeni) veya `unchanged' (değişmemiş) olabilir. \n" -" GTÜR, LTÜR veya `changed' (değişmiş) olabilir." +" LTYPE 'old', 'new' veya 'unchanged' olabilir. GTYPE, LTYPE veya " +"'changed'dir." -#: src/diff.c:908 -#, fuzzy +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -992,7 +982,7 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -" GBÇ aşağıdakileri içerebilir:\n" +" GFMT (sadece) aşağıdakileri içerebilir:\n" " %< DOSYA1'den satırlar\n" " %> DOSYA2'den satırlar\n" " %= DOSYA1 ve DOSYA2'de ortak olan satırlar\n" @@ -1003,24 +993,23 @@ msgstr "" " L son satır numarası\n" " N satır sayısı = L-F+1\n" " E F-1\n" -" M L+1" +" M L+1\n" +" %(A=B?T:E) eğer A eşittir B ise T değilse E" -#: src/diff.c:920 -#, fuzzy +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -" LBÇ aşağıdakileri içerebilir:\n" +" LFMT (sadece) aşağıdakileri içerebilir:\n" " %L satırın içeriği\n" " %l sonlayan yenisatır karakteri hariç, satırın içeriği\n" -" %[-][GENİŞLİK][.[KESİNLİK]]{doxX}n girdi satır sayısı için printf\n" -" tarzı biçem" +" %[-][GENİŞLİK][.[KESİNLİK]]{doxX}n girdi satır sayısı için printf tarzı " +"biçem" -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1028,101 +1017,101 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -" GBÇ veya LBÇ aşağıdakileri içerebilir:\n" +" GFMT ve LFMT aşağıdakileri içerebilir:\n" " %% %\n" " %c'C' tekli karakter C\n" -" %c'\\OOO' Sekizlik kodu OOO olan karakter" +" %c'\\OOO' Sekizlik kodu OOO olan karakter\n" +" C C karakteri (diğer karakterler kendilerini temsil eder)" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Daha küçük bir fark kümesi bulmaya çalışır." +msgstr "-d, --minimal daha küçük bir fark kümesi bulmaya çalış" -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" -msgstr "--horizon-lines=SAYI ortak ilkek ve soneklerin SAYI satırını tutar." +msgstr " --horizon-lines=SAYI ortak ön ek ve son eklerin SAYI satırını tut" -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" -"-H --speed-large-files Büyük dosyalar ve çok sayıda dağınık küçük \n" -" farklar olduğunu farzeder." +" --speed-large-files büyük dosyalar ve çok sayıda dağınık küçük farklar " +"olduğunu varsay" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" -msgstr "" +msgstr " --help bu yardım metnini göster ve çık" -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:939 msgid "-v, --version output version information and exit" -msgstr "-v --version Sürüm bilgisini gösterir." +msgstr "-v, --version sürüm bilgisini göster ve çık" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"DOSYAlar: `DOSYA1 DOSYA2' veya `DİZİN1 DİZİN2' veya `DİZİN DOSYA...' \n" -" veya `DOSYA...DİZİN';" +"DOSYAlar: `DOSYA1 DOSYA2' veya `DİZİN1 DİZİN2' veya `DİZİN DOSYA...' veya " +"`DOSYA...DİZİN' olabilir." -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -"eğer --from-file veya --to-file kullanılmışsa, DOSYAlar üzerinde \n" -"kısıtlama yoktur." +"Eğer --from-file veya --to-file kullanılmışsa, DOSYAlar üzerinde kısıtlama " +"yoktur." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." msgstr "Eğer bir DOSYA `-' ise, standart girdi okunur." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Kullanım: %s [SEÇENEK]... DOSYAlar\n" -#: src/diff.c:950 -#, fuzzy +#: src/diff.c:954 msgid "Compare FILES line by line." -msgstr "Dosyaları satır satır karşılaştırır." +msgstr "DOSYAları satır satır karşılaştırır." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "çelişkili %s seçeneği değeri: `%s'" +msgid "conflicting %s option value '%s'" +msgstr "çelişkili %s seçeneği değeri: '%s'" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "çelişkili çıktı tarz seçenekleri" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Yalnızca %s'da: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "`-', bir dizinle karşılaştırılamaz" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "'-', bir dizinle karşılaştırılamaz" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D seçenek dizinler için kullanılamaz." -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Ortak alt dizinler: %s ve %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "%s dosyası, bir %s, halbuki %s dosyası bir %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "%s ve %s sembolik bağlantıları birbirinden farklı\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "%s ve %s dosyaları birbirinin aynı\n" @@ -1130,7 +1119,7 @@ msgstr "%s ve %s dosyaları birbirinin aynı\n" #. This is a proper name. See the gettext manual, section Names. #: src/diff3.c:41 msgid "Randy Smith" -msgstr "" +msgstr "Randy Smith" #: src/diff3.c:313 #, c-format @@ -1138,108 +1127,103 @@ msgid "incompatible options" msgstr "uyumsuz seçenekler" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "`-' birden fazla girdi dosyası için belirtilmiş" +msgid "'-' specified for more than one input file" +msgstr "'-' birden fazla girdi dosyası için belirtilmiş" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "okuma başarısız oldu" #: src/diff3.c:428 -#, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -"-A --show-all Bütün değişiklikleri çıktılar, ihtilafları köşeli parantez\n" -" içine alır." +"-A, --show-all bütün değişiklikleri çıktıla, çakışmaları köşeli " +"parantez içine al" #: src/diff3.c:430 -#, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed ESKİDOSYA ile SİZİNDOSYA arasındaki harmanlanmamış farkları\n" -" BENİMDOSYA'ya çıktılar." +"-e, --ed ESKİDOSYA ile SİZİNDOSYA arasındaki " +"harmanlanmamış\n" +" ed betiklerini BENİMDOSYA'ya çıktıla" #: src/diff3.c:432 -#, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" -"-E --show-overlap Harmanlanmamış değişiklikleri çıktılar, ihtilafları \n" -" köşeli parantez içinde gösterir." +"-E, --show-overlap -e'ye benzer, fakat çakışmaları parantez içine " +"alır" #: src/diff3.c:433 -#, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -"-3 --easy-only Harmanlanmamış, tekrarlanmayan değişiklikleri çıktılar." +"-3, --easy-only -e gibi, fakat sadece örtüşmeyen değişiklikleri " +"birleştir" #: src/diff3.c:434 -#, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only Birbiri ile örtüşen farkları gösterir." +msgstr "" +"-x, --overlap-only -e gibi, fakat sadece örtüşen değişiklikleri " +"birleştir" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Harmanlanmamış değişiklikleri çıktılar, ihtilafları \n" -" köşeli parantez içinde gösterir." +"-X -x gibi ancak çakışmaları parantez içine alır" #: src/diff3.c:436 -#, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i Ed betiklerinin sonuna `w' ve `q' komutlarını ekler." +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "" +"-i ed betiklerinin sonuna `w' ve `q' komutlarını " +"ekle" #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge asıl birleştirilmiş dosyayı, başka bir seçenek\n" +" verilmediyse -A ya göre gösterir" #: src/diff3.c:441 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Bütün dosyaları metin imişcesine işler." +msgstr "-a, --text bütün dosyaları metin olarak işle" #: src/diff3.c:442 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr Girdiden en sonda sarkan satır başını soyar." +msgstr " --strip-trailing-cr girdiden en sonda sarkan satır başını soy" #: src/diff3.c:443 -#, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Başlarına bir sekme ilave ederek sekmelerin " -"hizalanmasını\n" -" sağlar." +"-T, --initial-tab başlarına bir sekme ilave ederek sekmelerin " +"hizalanmasını sağla" #: src/diff3.c:444 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=YAZILIM Dosyaları karşılaştırmak için YAZILIM'ı kullanır." +" --diff-program=YAZILIM dosyaları karşılaştırmak için YAZILIM'ı kullan" #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=ETİKET dosya adı yerine ETİKET kullan\n" +" (üç defaya kadar tekrarlanabilir)" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Bütün dosyaları metin imişcesine işler." +msgstr " --help bu yardım metnini göster ve çık" #: src/diff3.c:449 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Sürüm bilgisini gösterir." +msgstr "-v, --version sürüm bilgisini göster ve çık" #: src/diff3.c:458 #, c-format @@ -1263,6 +1247,15 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"Öntanımlı çıktı biçimi, değişikliklerin kişi-okunabilir gösterimidir.\n" +"\n" +"-e, -E, -x, -X (ve ilgili uzun) seçenekler, öntanımlı yerine bir ed betiği\n" +"çıktı vermesine sebep olurlar.\n" +"\n" +"Son olarak, -m (--merge) seçeneği, diff3'ün dahili olarak birleştirme\n" +"yapmasına neden olur ve asıl birleştirilen dosya çıkarılır. Alışılmadık\n" +"girdiler için, bu ed kullanımından daha dayanıklıdır.\n" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." @@ -1277,7 +1270,7 @@ msgstr "iç hata: diff blokları biçemlemesinde hata oluştu" #: src/diff3.c:968 #, c-format msgid "%s: diff failed: " -msgstr "%s: diff başarısız oldu:" +msgstr "%s: diff başarısız oldu: " #: src/diff3.c:990 msgid "internal error: invalid diff type in process_diff" @@ -1287,175 +1280,163 @@ msgstr "iç hata: process_diff işlevi içinde geçersiz diff türü" msgid "invalid diff format; invalid change separator" msgstr "geçersiz diff biçemi; geçersiz fark ayracı" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "geçersiz diff biçemi; tamamlanmamış son satır" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "alt yazılım `%s' çalıştırılamadı" +msgid "subsidiary program '%s' could not be invoked" +msgstr "alt yazılım '%s' çalıştırılamadı" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "geçersiz diff biçemi; geçersiz satır başı karakterleri" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "iç hata: çıktıya geçersiz diff türü geçirildi" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "girdi dosyası küçüldü" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "dosya isimleri `%s' ve `%s' karşılaştırılamıyor" +msgid "cannot compare file names '%s' and '%s'" +msgstr "dosya isimleri '%s' ve '%s' karşılaştırılamıyor" #: src/dir.c:209 #, c-format msgid "%s: recursive directory loop" -msgstr "" +msgstr "%s: iç dizin döngüsü" #. This is a proper name. See the gettext manual, section Names. #: src/sdiff.c:42 msgid "Thomas Lord" -msgstr "" +msgstr "Thomas Lord" -#: src/sdiff.c:170 -#, fuzzy +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" -"-o DOSYA --output=DOSYA Interaktif olarak çalışır, çıktıyı DOSYA'ya\n" -" yönlendirir." +"-o, --output=DOSYA etkileşimli olarak çalış, çıktıyı DOSYA'ya " +"yönlendir" -#: src/sdiff.c:172 -#, fuzzy +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" -msgstr "-i --ignore-case Büyük harf/küçük harf farkı gözetmez." +msgstr "-i, --ignore-case büyük harf/küçük harf farkı gözetme" -#: src/sdiff.c:173 -#, fuzzy +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion Sekmelerin açılmasından doğan farkları yoksayar." +"-E, --ignore-tab-expansion sekmelerin açılmasından doğan farkları yoksay" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space Bütün boşlukları yoksayar." +msgstr "-Z, --ignore-trailing-space bütün satır sonu boşluklarını yoksay" -#: src/sdiff.c:175 -#, fuzzy +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "" -"-b --ignore-space-change Boşluk miktarındaki değişiklikleri yoksayar." +msgstr "-b, --ignore-space-change boşluk miktarındaki değişiklikleri yoksay" -#: src/sdiff.c:176 -#, fuzzy +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space Bütün boşlukları yoksayar." +msgstr "-W, --ignore-all-space bütün boşlukları yoksay" -#: src/sdiff.c:177 -#, fuzzy +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B --ignore-blank-lines Satırları boş olan değişiklikleri dikkate almaz." +"-B, --ignore-blank-lines satırları boş olan değişiklikleri dikkate alma" -#: src/sdiff.c:179 -#, fuzzy +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=DÜZİF satırları DÜZİF kalıbına uyan farkları " +"yoksay" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr Girdiden en sonda sarkan satır başını soyar." +msgstr "" +" --strip-trailing-cr girdiden en sonda sarkan satır başını soy" -#: src/sdiff.c:180 -#, fuzzy +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" -msgstr "-a --text Bütün dosyaları metin imişcesine işler." +msgstr "-a, --text bütün dosyaları metin olarak işle" -#: src/sdiff.c:182 -#, fuzzy +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w SAYI --width=SAYI Satır başına en fazla SAYI kadar karakter çıktılar\n" -" (öntanımlı 130)." +"-W, --width=SAYI satır başına en fazla SAYI kadar karakter " +"çıktılar (öntanımlı 130)" -#: src/sdiff.c:183 -#, fuzzy +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column Ortak satırları yalnızca sol sütunda çıktılar." +msgstr "" +"-W, --width=SAYI satır başına en fazla SAYI kadar karakter " +"çıktılar (öntanımlı 130)" -#: src/sdiff.c:184 -#, fuzzy +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Ortak satırları göstermez." +msgstr "-s, --suppress-common-lines ortak satırlayı gösterme" -#: src/sdiff.c:186 -#, fuzzy +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs Çıktıda sekmeleri boşluk haline getirir." +msgstr "-t, --expand-tabs çıktıda sekmeleri boşluk haline getir" -#: src/sdiff.c:187 -#, fuzzy +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" -"--tabsize=SAYI Sekmeler SAYI sütun genişliğine (öntanımlı 8) ayarlanır." +" --tabsize=SAYI sekmeleri SAYI sütun genişliğine (öntanımlı 8) " +"ayarla" -#: src/sdiff.c:189 -#, fuzzy +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Daha küçük bir fark kümesi bulmaya çalışır." +msgstr "-d, --minimal daha küçük bir fark kümesi bulmaya çalış" -#: src/sdiff.c:190 -#, fuzzy +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H --speed-large-files Büyük dosyalar ve çok sayıda dağınık küçük \n" -" farklar olduğunu farzeder." +"-H, --speed-large-files büyük dosyalar ve çok sayıda dağınık küçük " +"farklar olduğunu varsay" -#: src/sdiff.c:191 -#, fuzzy +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=YAZILIM Dosyaları karşılaştırmak için YAZILIM'ı kullanır." +" --diff-program=YAZILIM dosyaları karşılaştırmak için YAZILIM'ı kullan" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Bütün dosyaları metin imişcesine işler." +msgstr " --help bu yardım metnini göster ve çık" -#: src/sdiff.c:194 -#, fuzzy +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" -msgstr "-v --version Sürüm bilgisini gösterir." +msgstr "-v, --version sürüm bilgisini göster ve çık" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Kullanım: %s [SEÇENEK]... DOSYA1 DOSYA2\n" -#: src/sdiff.c:205 -#, fuzzy +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Dosya farklarının yanyana katıştırılması." +msgstr "DOSYA1 vey DOSYA2 arasındaki farkları yan yana birleştir." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "interaktif olarak standart girdi harmanlanamaz" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "karşılaştırılacak her iki dosya da dizin" -#: src/sdiff.c:827 -#, fuzzy +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1472,13 +1453,27 @@ msgstr "" "eb:\tDüzenler, sonra iki tarafı da kullanır.\n" "el:\tDüzenler, sonra sol tarafı kullanır.\n" "er:\tDüzenler, sonra sağ tarafı kullanır.\n" -"e:\tYeni bir sürüm düzenler.\n" -"l:\tSol tarafı kullanır.\n" -"r:\tSağ tarafı kullanır.\n" +"e:\tYeni bir sürüm düzenler, iki sürümü de ihmal eder.\n" +"l veya 1:\tSol tarafı kullanır.\n" +"r veya 2:\tSağ tarafı kullanır.\n" "s:\tOrtak satırları sessizce dahil eder.\n" "v:\tOrtak satırları bilgi vererek dahil eder.\n" "q:\tÇıkar.\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s: kuraldışı seçenek -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "Bu, özgür yazılımdır; kaynak koduna bakarak kopyalama şartlarını\n" +#~ "görebilirsiniz. SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA UYGUNLUĞU için " +#~ "dahi\n" +#~ "GARANTİ YOKTUR.\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i ATLA1:ATLA2 --ignore-initial=ATLA1:ATLA2" @@ -1487,53 +1482,26 @@ msgstr "" #~ "-s --quiet --silent Hiç bir şey çıktılamaz, yalnızca çıkış durumunu " #~ "bildirir." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Sürüm bilgisini gösterir." - #~ msgid "--help Output this help." #~ msgstr "--help Bu yardımı gösterir." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "Üç dosyayı satır satır karşılaştırır." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "" -#~ "-E --ignore-tab-expansion Sekmelerin açılmasından doğan farkları " -#~ "yoksayar." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "" -#~ "-b --ignore-space-change Boşluk miktarındaki değişiklikleri yoksayar." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Bütün boşlukları yok sayar." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." #~ msgstr "" -#~ "-B --ignore-blank-lines Satırları boş olan değişiklikleri dikkate almaz." +#~ "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine, \n" +#~ "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin." -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Girdiden en sonda sarkan satır başını soyar." +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "`-%ld' seçeneği kullanımdan kalktı; `-%c %ld' kullanın" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Bütün dosyaları metin imişcesine işler." +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "`-%ld' seçeneği kullanımdan kalktı; kullanmayın" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1549,10 +1517,6 @@ msgstr "" #~ "uygun olan\n" #~ " en son satırı gösterir." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Bir ed betiği çıktılar." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1566,39 +1530,12 @@ msgstr "" #~ " --left-column Ortak satırlarda yalnız sol sütunu gösterir.\n" #~ " --suppress-common-lines Ortak satırları göstermez." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs Çıktıda sekmeleri boşluk haline getirir." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Başlarına bir sekme ilave ederek sekmelerin " -#~ "hizalanmasını\n" -#~ " sağlar." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=SAYI Sekmeler SAYI sütun genişliğine (öntanımlı 8) ayarlanır." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Daha küçük bir fark kümesi bulmaya çalışır." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Büyük dosyalar ve çok sayıda dağınık küçük \n" #~ " farklar olduğunu farzeder." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Bütün değişiklikleri çıktılar, ihtilafları köşeli " -#~ "parantez\n" -#~ " içine alır." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "" #~ "-X Birbiriyle örtüşen farkları köşeli parantez içinde göstererek " @@ -1611,83 +1548,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L ETİKET --label=ETİKET Dosya adı yerine ETİKET'i kullanır." -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=YAZILIM Dosyaları karşılaştırmak için YAZILIM'ı kullanır." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space Bütün boşlukları yok sayar." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w SAYI --width=SAYI Satır başına en fazla SAYI kadar karakter " -#~ "çıktılar\n" -#~ " (öntanımlı 130)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Ortak satırları yalnızca sol sütunda çıktılar." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Büyük dosyalar ve çok sayıda dağınık küçük \n" -#~ " farklar olduğunu farzeder." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "okuma başarısız oldu" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "yazma başarısız oldu" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "okuma başarısız oldu" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "okuma başarısız oldu" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "yazma başarısız oldu" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "yazma başarısız oldu" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: kuraldışı seçenek -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Bu, özgür yazılımdır; kaynak koduna bakarak kopyalama şartlarını\n" -#~ "görebilirsiniz. SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA UYGUNLUĞU için " -#~ "dahi\n" -#~ "GARANTİ YOKTUR.\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "" -#~ "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine, \n" -#~ "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "`-%ld' seçeneği kullanımdan kalktı; `-%c %ld' kullanın" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "`-%ld' seçeneği kullanımdan kalktı; kullanmayın" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "alt yazılım `%s' bulunamadı" @@ -3,20 +3,20 @@ # This file is distributed under the same license as the diffutils package. # # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2006. -# Yuri Chornoivan <yurchor@ukr.net>, 2011. +# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: diffutils 3.1\n" +"Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2011-08-13 18:45+0300\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-10-31 08:58+0200\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" #: lib/c-stack.c:204 lib/c-stack.c:297 @@ -27,7 +27,7 @@ msgstr "помилка програми" msgid "stack overflow" msgstr "переповнення стеку" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Невідома системна помилка" @@ -140,100 +140,102 @@ msgstr "%s: до параметра «-W %s» слід додати аргуме #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "`" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "'" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Успішно" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "Немає відповідностей" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Неправильний регулярний вираз" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Некоректний символ для сортування" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Неправильна назва класу символу" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "Зворотна коса риска стоїть останньою" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Неправильне посилання" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Непарна [ чи [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Непарна ( чи \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Непарна \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "Неправильний вміст \\{\\}" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "Неправильна нижня межа" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "Оперативну пам'ять вичерпано" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Неправильний попередній регулярний вираз" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Передчасний кінець регулярного виразу" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Регулярний вираз надто великий" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Непарна ) чи \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Регулярний вираз не було вказано раніше" @@ -264,18 +266,18 @@ msgstr "не вдалося повторно відкрити %s у режимі #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "некоректний аргумент %s%s — «%s»" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "некоректний суфікс у аргументі %s%s: «%s»" +msgid "invalid suffix in %s%s argument '%s'" +msgstr "некоректний суфікс у аргументі %s%s «%s»" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" -msgstr "Аргумент %s%s «%s» є занадто великим" +msgid "%s%s argument '%s' too large" +msgstr "%s%s, аргумент «%s» є занадто об'ємним" #: lib/version-etc.c:74 #, c-format @@ -453,7 +455,7 @@ msgstr "" "Загальна довідка з програмного забезпечення GNU: <http://www.gnu.org/gethelp/" ">\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Файли %s та %s відрізняються\n" @@ -463,7 +465,7 @@ msgstr "Файли %s та %s відрізняються\n" msgid "Binary files %s and %s differ\n" msgstr "Двійкові файли %s та %s відрізняються\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Наприкінці файлу немає нового рядка" @@ -477,29 +479,29 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Спробуйте `%s --help' для отримання докладнішого опису." +msgid "Try '%s --help' for more information." +msgstr "Спробуйте «%s --help» для отримання докладнішого опису." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "неприпустиме значення --ignore-initial `%s'" +msgid "invalid --ignore-initial value '%s'" +msgstr "неприпустиме значення --ignore-initial «%s»" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "параметри -l та -s несумісні" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "запис невдалий" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "стандартний вивід" @@ -564,7 +566,7 @@ msgstr "" "Додаткові аргументи Н1 та Н2 визначають кількість байтів, які слід\n" "пропустити на початку кожного файла (типово байти не пропускаються)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -582,11 +584,12 @@ msgstr "" "GB 1,000,000,000, G 1,073,741,824, і так далі для T, P, E, Z, Y." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +msgid "If a FILE is '-' or missing, read standard input." msgstr "" -"Якщо ФАЙЛ не вказаний чи вказаний як `-', читається стандартний потік вводу." +"Якщо ФАЙЛ не вказано або вказано як «-», дані буде прочитано зі стандартного " +"потоку введення." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Код завершення дорівнює 0, якщо вхідні файли ідентичні, 1 -- якщо\n" @@ -594,18 +597,18 @@ msgstr "" #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "неприпустиме значення --bytes `%s'" +msgid "invalid --bytes value '%s'" +msgstr "некоректне значення --bytes «%s»" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "пропущено операнд після `%s'" +msgid "missing operand after '%s'" +msgstr "пропущено операнд після «%s»" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "зайвий операнд `%s'" +msgid "extra operand '%s'" +msgstr "зайвий операнд «%s»" #: src/cmp.c:491 #, c-format @@ -623,143 +626,143 @@ msgid "cmp: EOF on %s\n" msgstr "cmp: кінець файлу у %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "неприпустима довжина контексту `%s'" +msgid "invalid context length '%s'" +msgstr "некоректна довжина контексту «%s»" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "розбиття на сторінки не підтримується на цій машині" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "надто багато параметрів, що вказують позначки файлів" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "неприпустима ширина `%s'" +msgid "invalid width '%s'" +msgstr "некоректна ширина «%s»" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "суперечливі параметри визначення ширини" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "неприпустима довжина горизонту `%s'" +msgid "invalid horizon length '%s'" +msgstr "некоректна довжина горизонту «%s»" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "неприпустима ширина табуляції `%s'" +msgid "invalid tabsize '%s'" +msgstr "неприпустима ширина табуляції «%s»" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "суперечливі параметри визначення ширини табуляції" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "необхідно вказати як --from-file, так і --to-file" -#: src/diff.c:851 +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" msgstr "" " --normal вивести дані у форматі звичайного diff (типово)" -#: src/diff.c:852 +#: src/diff.c:855 msgid "-q, --brief report only when files differ" msgstr "-q, --brief сповіщати лише про різні файли" -#: src/diff.c:853 +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files сповіщати про однакові файли" -#: src/diff.c:854 +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C КТЬ, --context[=КТЬ] вивести КТЬ (типово 3) рядки скопійованого " "контексту" -#: src/diff.c:855 +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U ЧИСЛО, --unified[=ЧИСЛО] вивести ЧИСЛО (типово 3) рядків спільного " "контексту" -#: src/diff.c:856 +#: src/diff.c:859 msgid "-e, --ed output an ed script" msgstr "-e, --ed вивести дані у форматі запису ed" -#: src/diff.c:857 +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" msgstr "" "-n, --rcs виводити у форматі diff систем керування " "версіями" -#: src/diff.c:858 +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side вивести дані у два стовпчики" -#: src/diff.c:859 +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ЧИСЛО виводити текст не більше ніж у ЧИСЛО (типово " "130) позицій у рядок" -#: src/diff.c:860 +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column виводити спільні рядки лише у ліву колонку" -#: src/diff.c:861 +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines не виводити однакові рядки" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function показати дані щодо функцій C у яких виявлено " "кожну зі змін" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE показати останній рядок, що відповідає " "формальному виразу RE" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" @@ -767,70 +770,75 @@ msgstr "" " --label МІТКА використати МІТКУ замість назви файла\n" " (можна використовувати декілька разів)" -#: src/diff.c:868 +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs замінювати символи табуляції пробілами у виводі" -#: src/diff.c:869 +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab вирівнювати табуляцію символами табуляції" -#: src/diff.c:870 +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=ЧИСЛО табуляція кожні ЧИСЛО позицій виведення " "(типово 8)" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty не показувати пробіли або табуляції перед " "порожніми рядками" -#: src/diff.c:872 -msgid "-l, --paginate pass output through `pr' to paginate it" +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate спрямувати дані до «pr» для розбиття на " "сторінки." -#: src/diff.c:874 +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive рекурсивно порівняти всі знайдені підкаталоги" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" +" --no-dereference не переходити за символічними посиланнями" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file вважати незнайдені файли порожніми" -#: src/diff.c:876 +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file вважати незнайдені у першому джерелі файли " "порожніми" -#: src/diff.c:877 +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case ігнорувати регістр назв файлів під час " "порівняння" -#: src/diff.c:878 +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case враховувати регістр символів назв файлів" -#: src/diff.c:879 +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x --exclude=ЗРАЗОК виключити файли, назви яких відповідають " "ЗРАЗКУ" -#: src/diff.c:880 +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" @@ -838,13 +846,13 @@ msgstr "" "зразкам\n" " з файла." -#: src/diff.c:881 +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=ФАЙЛ починати порівняння каталогів на файлі ФАЙЛ" -#: src/diff.c:882 +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -852,7 +860,7 @@ msgstr "" " --from-file=ФАЙЛ1 порівняти ФАЙЛ1 з усіма операндами;\n" " ФАЙЛ1 може бути каталогом" -#: src/diff.c:884 +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -860,85 +868,84 @@ msgstr "" " --to-file=ФАЙЛ2 порівняти всі операнди з ФАЙЛОМ " "2; ФАЙЛ2 може бути каталогом." -#: src/diff.c:887 +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case ігнорувати регістр літер у вмісті файлів" -#: src/diff.c:888 +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion ігнорувати зміни, викликані заміною " "табуляції пробілами" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W --ignore-all-space ігнорувати усі пробіли" +msgstr "-Z, --ignore-trailing-space ігнорувати пробіли наприкінці рядка" -#: src/diff.c:890 +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change ігнорувати зміни у кількості пробілів" -#: src/diff.c:891 +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space ігнорувати усі пробіли" -#: src/diff.c:892 +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines ігнорувати зміни кількості порожніх рядків" -#: src/diff.c:893 src/sdiff.c:178 -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE ігнорувати зміни, які відповідають " "формальному виразу RE" -#: src/diff.c:895 +#: src/diff.c:899 msgid "-a, --text treat all files as text" msgstr "-a, --text вважати всі файли текстовими" -#: src/diff.c:896 +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr вилучити з виведених даних всі завершальні " "символи нового рядка" -#: src/diff.c:898 +#: src/diff.c:902 msgid " --binary read and write data in binary mode" msgstr "" " --binary читати та записувати файли у двійковій формі" -#: src/diff.c:901 +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=НАЗВА виводити diff-блоки, що використовують " "конструкцію «#ifdef НАЗВА»." -#: src/diff.c:902 +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --ГТИП-group-format=ГФМТ форматувати вхідні групи типу ГТИП\n" " у відповідності до формату ГФМТ." -#: src/diff.c:903 +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=СФМТ форматувати всі вхідні рядки за допомогою " "СФМТ." -#: src/diff.c:904 +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --CТИП-group-format=СФМТ форматувати вхідні рядки типу СТИП\n" " у відповідності до формату СФМТ" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -946,13 +953,12 @@ msgstr "" " За допомогою цих параметрів форматування можна точно налаштувати\n" " вивід diff, з узагальненням -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" СТИП може бути `old', `new', чи `unchanged', ГТИП - те ж саме або " -"`changed'." +" СТИП може бути «old», «new» чи «unchanged», ГТИП — те саме або «changed»." -#: src/diff.c:908 +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -980,7 +986,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) якщо A дорівнює B, T, інакше E" -#: src/diff.c:920 +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -992,7 +998,7 @@ msgstr "" " %l вміст рядка без символу нового рядка наприкінці\n" " %[-][ШИРИНА][.[ТОЧН]]{doxX}n формат номеру вхідного рядка у стилі printf" -#: src/diff.c:924 +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1006,91 +1012,98 @@ msgstr "" " %c'\\OOO' один символ з вісімковим кодом OOO\n" " C символ C (інші символи не оброблятимуться)" -#: src/diff.c:930 +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal намагатись знайти найменший набір змін" -#: src/diff.c:931 +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ЧИСЛО зберегти ЧИСЛО спільних рядків, до та після різних" -#: src/diff.c:932 +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files вважати файли великими з багатьма розкиданими\n" " дрібними змінами." -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" " --help показати це довідкове повідомлення і завершити " "роботу" -#: src/diff.c:935 +#: src/diff.c:939 msgid "-v, --version output version information and exit" msgstr "-v, --version показати дані щодо версії і завершити роботу" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"ФАЙЛИ - це `ФАЙЛ1 ФАЙЛ2', чи `КАТАЛОГ1 КАТАЛОГ2', чи `КАТАЛОГ ФАЙЛ...',\n" -"чи `ФАЙЛ... КАТАЛОГ'." +"ФАЙЛИ — це «ФАЙЛ1 ФАЙЛ2», чи «КАТАЛОГ1 КАТАЛОГ2», чи «КАТАЛОГ ФАЙЛ...»,\n" +"чи «ФАЙЛ... КАТАЛОГ»." -#: src/diff.c:938 +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Якщо вказано --from-file чи --to-file, на ФАЙЛИ обмежень немає." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Якщо ФАЙЛ вказаний як `-', читається стандартний потік вводу." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "" +"Якщо ФАЙЛ вказано як «-», дані буде прочитано зі стандартного потоку " +"введення." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Використання: %s [КЛЮЧ]... ФАЙЛИ\n" -#: src/diff.c:950 +#: src/diff.c:954 msgid "Compare FILES line by line." msgstr "Порівнює два файли за рядками." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "суперечливі значення %s для ключа `%s'" +msgid "conflicting %s option value '%s'" +msgstr "суперечливі значення %s для ключа «%s»" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "суперечливі ключі визначення стилю виводу" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Лише у %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "неможливо порівняти `-' з каталогом" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "не можна порівнювати «-» з каталогом" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D параметр не підтримується для каталогів" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Спільні підкаталоги: %s та %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Файл %s це %s, тоді як файл %s -- %s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Символічні посилання %s і %s є різними\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "Файли %s та %s ідентичні\n" @@ -1106,11 +1119,11 @@ msgid "incompatible options" msgstr "несумісні ключі" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "`-' вказано для більш ніж одного вхідного файлу" +msgid "'-' specified for more than one input file" +msgstr "«-» вказано для більш ніж одного вхідного файла" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "помилка читання" @@ -1155,7 +1168,7 @@ msgstr "" "-X подібно до -x, але з взяттям розбіжностей у дужки" #: src/diff3.c:436 -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i дописувати команди «w» і «q» в кінець сценарію " "ed." @@ -1266,31 +1279,31 @@ msgstr "" msgid "invalid diff format; invalid change separator" msgstr "неправильний формат diff-файлу; неправильний розділювач змін" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "неправильний формат diff-файлу; неповний останній рядок" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "не вдається запустити допоміжну програму `%s'" +msgid "subsidiary program '%s' could not be invoked" +msgstr "не вдається запустити допоміжну програму «%s»" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "неправильний diff-формат; неправильні перші символи рядка" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "внутрішня помилка: на вхід подано неправильний тип diff-файлу" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "вхідний файл зменшився" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "неможливо порівняти назви файлів `%s' та `%s'" +msgid "cannot compare file names '%s' and '%s'" +msgstr "неможливо порівняти назви файлів «%s» та «%s»" #: src/dir.c:209 #, c-format @@ -1302,126 +1315,131 @@ msgstr "%s: зациклення рекурсивного проходу кат msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o, --output=ФАЙЛ інтерактивний режим із записом виводу до ФАЙЛА" -#: src/sdiff.c:172 +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case ігнорувати регістр літер" -#: src/sdiff.c:173 +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion ігнорувати зміни, викликані заміною табуляції " "пробілами" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-W --ignore-all-space ігнорувати усі пробіли" +msgstr "-Z, --ignore-trailing-space ігнорувати пробіли наприкінці рядка" -#: src/sdiff.c:175 +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change ігнорувати зміни у кількості пробілів" -#: src/sdiff.c:176 +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W --ignore-all-space ігнорувати усі пробіли" -#: src/sdiff.c:177 +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B --ignore-blank-lines ігнорувати зміни кількості порожніх рядків" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE ігнорувати зміни, які відповідають " +"формальному виразу RE" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr вилучити з виведених даних всі завершальні " "символи нового рядка" -#: src/sdiff.c:180 +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" msgstr "-a, --text вважати всі файли текстовими" -#: src/sdiff.c:182 +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=ЧИСЛО виводити текст не більше ніж у ЧИСЛО (типово " "130) позицій у рядок" -#: src/sdiff.c:183 +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l, -left-column виводити спільні рядки лише у ліву колонку" -#: src/sdiff.c:184 +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines не виводити спільні рядки" -#: src/sdiff.c:186 +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs замінювати символи табуляції пробілами у виводі" -#: src/sdiff.c:187 +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" " --tabsize=ЧИСЛО табуляція кожні ЧИСЛО позицій виведення (типово " "8)" -#: src/sdiff.c:189 +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal намагатись знайти найменший набір змін" -#: src/sdiff.c:190 +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" "-H, -speed-large-files вважати файли великими з багатьма розкиданими\n" " дрібними змінами." -#: src/sdiff.c:191 +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=ПРОГРАМА використовувати для порівняння вказану ПРОГРАМУ" -#: src/sdiff.c:193 +#: src/sdiff.c:196 msgid " --help display this help and exit" msgstr "" " --help показати це довідкове повідомлення і завершити " "роботу" -#: src/sdiff.c:194 +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" msgstr "" "-v, --version показати дані щодо версії і завершити роботу" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Використання: %s [КЛЮЧ]... ФАЙЛ1 ФАЙЛ2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "Паралельне об’єднання файлів ФАЙЛ1 і ФАЙЛ2." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "не можна інтерактивно об'єднувати стандартний потік вводу" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "обидва файли, що порівнюються є каталогами" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" Binary files differ@@ -1,22 +1,25 @@ # Vietnamese translation for Diff Utils. -# Copyright © 2010 Free Software Foundation, Inc. +# Copyright © 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # Clytie Siddall <clytie@riverland.net.au>, 2005-2010. +# Trần Ngọc Quân <vnwildman@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.0\n" +"Project-Id-Version: diffutils-3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" -"PO-Revision-Date: 2010-05-07 18:31+0930\n" -"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" -"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" +"PO-Revision-Date: 2012-11-01 13:51+0700\n" +"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Team-Website: <http://translationproject.org/team/vi.html>\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" +"X-Poedit-SourceCharset: UTF-8\n" #: lib/c-stack.c:204 lib/c-stack.c:297 msgid "program error" @@ -24,15 +27,15 @@ msgstr "lỗi chương trình" #: lib/c-stack.c:205 lib/c-stack.c:298 msgid "stack overflow" -msgstr "đống bị tràn" +msgstr "stack bị tràn" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "Không biết lỗi hệ thống" #: lib/file-type.c:38 msgid "regular empty file" -msgstr "tập tin trống thường" +msgstr "tập tin trống thông thường" #: lib/file-type.c:38 msgid "regular file" @@ -52,7 +55,7 @@ msgstr "tập tin đặc biệt ký tự" #: lib/file-type.c:50 msgid "fifo" -msgstr "fifo (vào trước, xuất trước)" +msgstr "fifo (vào trước, ra trước)" #: lib/file-type.c:53 msgid "symbolic link" @@ -60,11 +63,11 @@ msgstr "liên kết mềm" #: lib/file-type.c:56 msgid "socket" -msgstr "ổ cắm" +msgstr "socket" #: lib/file-type.c:59 msgid "message queue" -msgstr "hàng đời thông điệp" +msgstr "hàng đợi thông điệp" #: lib/file-type.c:62 msgid "semaphore" @@ -76,163 +79,165 @@ msgstr "đối tượng bộ nhớ dùng chung" #: lib/file-type.c:68 msgid "typed memory object" -msgstr "đốí tượng bộ nhớ đánh loại" +msgstr "đối tượng bộ nhớ đánh loại" #: lib/file-type.c:70 msgid "weird file" msgstr "tập tin lạ" #: lib/getopt.c:547 lib/getopt.c:576 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tùy chọn « %s » vẫn mơ hồ\n" +msgstr "%s: tùy chọn “%s” chưa rõ ràng; khả năng là:" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: tùy chọn « --%s » không cho phép đối số\n" +msgstr "%s: tùy chọn “--%s” không cho phép đối số\n" #: lib/getopt.c:637 lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n" +msgstr "%s: tùy chọn “%c%s” không cho phép đối số\n" #: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: tùy chọn « --%s » yêu cầu một đối số\n" +msgstr "%s: tùy chọn “--%s” yêu cầu một đối số\n" #: lib/getopt.c:742 lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: không nhận ra tùy chọn « --%s »\n" +msgstr "%s: không nhận ra tùy chọn “--%s”\n" #: lib/getopt.c:753 lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: không nhận ra tùy chọn « %c%s »\n" +msgstr "%s: không nhận ra tùy chọn “%c%s”\n" #: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: tùy chọn không hợp lệ -- « %c »\n" +msgstr "%s: tùy chọn không hợp lệ -- “%c”\n" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: tùy chọn yêu cầu một đối số -- « %c »\n" +msgstr "%s: tùy chọn yêu cầu một đối số -- “%c”\n" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: tùy chọn « -W %s » vẫn mơ hồ\n" +msgstr "%s: tùy chọn “-W %s” chưa rõ ràng\n" #: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n" +msgstr "%s: tùy chọn “-W %s” không cho phép đối số\n" #: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tùy chọn « -W %s » yêu cầu một đối số\n" +msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" -msgstr "« " +msgstr "“" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" -msgstr " »" +msgstr "”" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "Thành công" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" -msgstr "Không khớp với gì" +msgstr "Không có gì khớp" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "Biểu thức chính quy không hợp lệ" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "Ký tự đối chiếu không hợp lệ" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "Tên hạng ký tự không hợp lệ" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" -msgstr "Có xuyệc ngược theo sau" +msgstr "Có gạch ngược theo sau" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "Tham chiếu trở lại không hợp lệ" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "Chưa khớp [ hay [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "Chưa khớp ( hay \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "Chưa khớp \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" -msgstr "Nội dụng \\{\\} không hợp lệ" +msgstr "Nội dung của \\{\\} không hợp lệ" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" -msgstr "Kết thức miền không hợp lệ" +msgstr "Kết thúc vùng không hợp lệ" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" -msgstr "Hết bộ nhớ ảo rồi" +msgstr "Hết bộ nhớ" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "Biểu thức chính quy đi trước không hợp lệ" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "Kết thức quá sớm của biểu thức chính quy" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "Biểu thức chính quy quá lớn" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "Chưa khớp ) hay \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "Không có biểu thức chính quy đi trước" @@ -263,18 +268,18 @@ msgstr "lỗi mở lại %s với chế độ %s" #: lib/xstrtol-error.c:63 #, c-format -msgid "invalid %s%s argument `%s'" -msgstr "sai đặt đối số %s%s « %s »" +msgid "invalid %s%s argument '%s'" +msgstr "đối số %s%s không hợp lệ “%s”" #: lib/xstrtol-error.c:68 #, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "gặp hậu tố sai trong đối số %s%s « %s »" +msgid "invalid suffix in %s%s argument '%s'" +msgstr "gặp hậu tố không hợp lệ trong %s%s đối số “%s”" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" -msgstr "đối số %s%s « %s » quá lớn" +msgid "%s%s argument '%s' too large" +msgstr "%s%s nhận đối số “%s” là quá lớn" #: lib/version-etc.c:74 #, c-format @@ -303,10 +308,10 @@ msgid "" "\n" msgstr "" "\n" -"Giấy phép GPL pb3+ : Giấy phép Công cộng GNU phiên bản 3 hay sau\n" +"Giấy phép GPL pb3+: Giấy phép Công cộng GNU phiên bản 3 hay sau\n" "<http://gnu.org/licenses/gpl.html>\n" -"Đây là phần mềm tự do : bạn có quyền sửa đổi và phát hành lại nó.\n" -"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều khiển được pháp luật cho phép.\n" +"Đây là phần mềm tự do: bạn có quyền sửa đổi và phát hành lại nó.\n" +"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n" "\n" #. TRANSLATORS: %s denotes an author name. @@ -360,7 +365,7 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" -"Tác gia: %s, %s, %s,\n" +"Tác giả: %s, %s, %s,\n" "%s, %s, và %s.\n" #. TRANSLATORS: Each %s denotes an author name. @@ -428,13 +433,13 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Thông báo lỗi nào cho : %s\n" -"Thông báo lỗi dịch nào cho Clytie <clytie@riverland.net.au>\n" +"Thông báo lỗi nào cho: %s\n" +"Thông báo lỗi dịch nào cho: <http://translationproject.org/team/vi.html>\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Thông báo lỗi %s nào cho : %s\n" +msgstr "Thông báo lỗi %s nào cho: %s\n" #: lib/version-etc.c:251 #, c-format @@ -451,7 +456,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Trợ giúp chung về cách sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "Hai tập tin %s và %s là khác nhau.\n" @@ -459,9 +464,9 @@ msgstr "Hai tập tin %s và %s là khác nhau.\n" #: src/analyze.c:462 #, c-format msgid "Binary files %s and %s differ\n" -msgstr "Hai tập tin nhị phân %s và %s còn khác nhau\n" +msgstr "Hai tập tin nhị phân %s và %s khác nhau\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "Không có ký tự dòng mới tại kêt thức tập tin." @@ -476,95 +481,93 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 #, c-format -msgid "Try `%s --help' for more information." -msgstr "Hãy thử lệnh `%s --help' để xem thông tin thêm." +msgid "Try '%s --help' for more information." +msgstr "Hãy chạy lệnh “%s --help” để xem thông tin thêm." #: src/cmp.c:137 #, c-format -msgid "invalid --ignore-initial value `%s'" -msgstr "tùy chọn --ignore-initial value (bỏ qua giá trị đầu) `%s' không hợp lệ" +msgid "invalid --ignore-initial value '%s'" +msgstr "" +"giá trị của tùy chọn --ignore-initial (bỏ qua giá trị đầu) “%s” không hợp lệ" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "hai tùy chọn -l và -s không tương thích với nhau" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "không ghi được" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "thiết bị xuất chuẩn" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes _In_ ra những byte khác nhau." +msgstr "-b, --print-bytes in ra những byte khác nhau." #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" -msgstr "-i SKIP --ignore-initial=SỐ _Bỏ qua_ số byte _đầu_ của dữ liệu gõ." +msgstr "" +"-i, --ignore-initial=SỐ bỏ qua SỐ byte khởi đầu của dữ liệu nhập" #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" -msgstr " Bỏ qua SỐ1 byte đầu của tập tin 1 và SỐ2 byte đầu của tập tin 2." +msgstr "" +"-i, --ignore-initial=SỐ1:SỐ2 bỏ qua SỐ1 byte đầu của TỆP-TIN1 và\n" +" SỐ2 byte đầu của TỆP-TIN2." #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" -"-l --verbose Xuất số byte và giá trị của tất cả byte khác nhau (_chi " -"tiết_)." +"-l, --verbose xuất số byte và giá trị của tất cả byte khác nhau" #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n SỐ --bytes=SỐ So sánh tối đa SỐ byte (_giới hạn_)." +msgstr "-n, --bytes=SỐ so sánh tối đa SỐ byte" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent loại bỏ tất cả các kết xuất thông thường" #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help hiển thị trợ giúp này rồi thoát" #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Xuất thông tin _phiên bản_." +msgstr "-v, --version đưa ra thông tin phiên bản rồi thoát" #: src/cmp.c:178 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" -msgstr "Cách sử dụng: %s [TÙY_CHỌN]... TẬP_TIN1 [TẬP_TIN2 [SỐ1 [SỐ2]]]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 [TẬP_TIN2 [SKIP1 [SKIP2]]]\n" #: src/cmp.c:180 msgid "Compare two files byte by byte." msgstr "So sánh mỗi byte trong hai tập tin." #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." -msgstr "Bỏ qua SỐ1 byte trong tập tin 1, và SỐ2 byte trong tập tin 2." +msgstr "" +"Tùy chọn SKIP1 và SKIP2 chỉ định số byte sẽ được bỏ qua\n" +"tại vị trí bắt đầu của mỗi tập tin (số không là mặc định)." -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" -msgstr "" +msgstr "Tùy chọn dài yêu cầu đối số thì tùy chọn ngắn cũng vậy.\n" #: src/cmp.c:191 msgid "" @@ -572,37 +575,36 @@ msgid "" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." msgstr "" -"Có thể sử dụng một của những chữ theo đây (số nhân lên) sau SỐ byte để bỏ " -"qua:\n" -"kB\tx 1000\t\t\t\tK\tx 1024\n" -"MB \tx 1,000,000\t\t\tM \tx 1,048,576,\n" -"GB \tx 1,000,000,000\t\tG \tx 1,073,741,824\n" -"\t\t\tcũng T, P, E, Z, Y v.v." +"SKIP có thể sử dụng một của những chữ theo đây để làm hệ số nhân:\n" +"kB x 1000\t\tK x 1024\n" +"MB x 1,000,000\t\tM x 1,048,576\n" +"GB x 1,000,000,000\tG x 1,073,741,824\n" +"tương tự với T, P, E, Z, Y v.v." #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." -msgstr "Nếu tập tin là `-', hay thiếu tập tin thì đọc thiết bị go chuẩn." +msgid "If a FILE is '-' or missing, read standard input." +msgstr "Nếu TẬP-TIN là “-”, hay bỏ trống, thì đọc từ đầu vào tiêu chuẩn." -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" -"Tính trạng thoát là số 0 nếu hai điều gõ là bằng nhau, số 1 nếu là khác nhau " -"và số 2 nếu gặp lỗi." +"Trạng thái thoát là số 0 nếu hai đầu vào bằng nhau, số 1 nếu là khác nhau và " +"số 2 nếu gặp lỗi." #: src/cmp.c:240 #, c-format -msgid "invalid --bytes value `%s'" -msgstr "giá trị --bytes `%s' không hợp lệ" +msgid "invalid --bytes value '%s'" +msgstr "giá trị cho tùy chọn --bytes “%s” không hợp lệ" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 #, c-format -msgid "missing operand after `%s'" -msgstr "thiếu tác tử sau `%s'" +msgid "missing operand after '%s'" +msgstr "thiếu toán hạng sau “%s”" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 #, c-format -msgid "extra operand `%s'" -msgstr "tác tử thêm `%s'" +msgid "extra operand '%s'" +msgstr "toán hạng bổ xung “%s”" #: src/cmp.c:491 #, c-format @@ -621,355 +623,331 @@ msgstr "cmp: gặp kết thức tập tin tại %s\n" # Tên họ #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "Paul Eggert" # Tên họ #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "Mike Haertel" # Tên họ #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "David Hayes" # Tên họ #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "Richard Stallman" # Tên họ #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:340 +#: src/diff.c:339 #, c-format -msgid "invalid context length `%s'" -msgstr "độ dài ngữ cảnh không hợp lệ `%s'" +msgid "invalid context length '%s'" +msgstr "độ dài ngữ cảnh không hợp lệ “%s”" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "máy chủ này không hỗ trợ dàn trang" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "quá nhiều tùy chọn nhãn tập tin" -#: src/diff.c:515 +#: src/diff.c:514 #, c-format -msgid "invalid width `%s'" -msgstr "độ rộng không hợp lệ `%s'" +msgid "invalid width '%s'" +msgstr "độ rộng không hợp lệ “%s”" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "nhiều tùy chọn độ rộng xung đột với nhau" -#: src/diff.c:544 +#: src/diff.c:543 #, c-format -msgid "invalid horizon length `%s'" -msgstr "độ dài tầm nhận thức (số dòng phụ tổ chung) không hợp lệ `%s'" +msgid "invalid horizon length '%s'" +msgstr "độ dài chiều đứng không hợp lệ “%s”" -#: src/diff.c:595 +#: src/diff.c:598 #, c-format -msgid "invalid tabsize `%s'" -msgstr "cỡ ký tự tab không hợp lệ `%s'" +msgid "invalid tabsize '%s'" +msgstr "cỡ ký tự tab không hợp lệ “%s”" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "nhiều tùy chọn cỡ ký tự tab xung đột với nhau" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "" "ghi rõ cả hai tùy chọn --from-file (từ tập tin) và --to-file (vào tập tin) " "đều" -#: src/diff.c:851 -#, fuzzy +#: src/diff.c:854 msgid " --normal output a normal diff (the default)" -msgstr "--normal Xuất dữ liệu khác biệt bình thường." +msgstr "" +" --normal xuất ra định dạng diff thông thường (mặc định)" -#: src/diff.c:852 -#, fuzzy +#: src/diff.c:855 msgid "-q, --brief report only when files differ" -msgstr "-q --brief Xuất chỉ nếu những tập tin khác với nhau (_ngắn_)." +msgstr "" +"-q, --brief chỉ báo cáo nếu những tập tin khác với nhau" -#: src/diff.c:853 -#, fuzzy +#: src/diff.c:856 msgid "-s, --report-identical-files report when two files are the same" -msgstr "" -"-s --report-identical-files _Thông báo_ khi có hai _tập tin bằng nhau_." +msgstr "-s, --report-identical-files báo cáo khi có hai tập tin bằng nhau" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-w SỐ --width=SỐ Xuất tối đa SỐ cột đã in ra (mặc định là 130) (_độ rộng_)." +"-c, -C SỐ, --context[=SỐ] xuất ra SỐ (mặc định là 3) dòng của ngữ cảnh" -#: src/diff.c:855 -#, fuzzy +#: src/diff.c:858 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-w SỐ --width=SỐ Xuất tối đa SỐ cột đã in ra (mặc định là 130) (_độ rộng_)." +"-u, -U SỐ, --unified[=SỐ] xuất ra SỐ (mặc định là 3) dòng của ngữ cảnh " +"hợp nhất" -#: src/diff.c:856 -#, fuzzy +#: src/diff.c:859 msgid "-e, --ed output an ed script" -msgstr "-a --text Xử lý mọi tập tin là _văn bản_." +msgstr "-e, --ed xuất tập lệnh loại ed" -#: src/diff.c:857 -#, fuzzy +#: src/diff.c:860 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs Xuất dữ liệu khác biệt dạng RCS." +msgstr "" +"-n, --rcs xuất dữ liệu khác biệt sử dụng định dạng RCS" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version Xuất thông tin _phiên bản_." +msgstr "-y, --side-by-side xuất ra theo đinh dạng hai cột" -#: src/diff.c:859 -#, fuzzy +#: src/diff.c:862 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w SỐ --width=SỐ Xuất tối đa SỐ cột đã in ra (mặc định là 130) (_độ rộng_)." +"-W, --width=SỐ xuất tối đa SỐ cột đã in ra (mặc định là 130)" -#: src/diff.c:860 -#, fuzzy +#: src/diff.c:863 msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column Xuất chỉ _cột bên trái_ của mọi dòng chung." +msgstr "" +" --left-column kết xuất chỉ cột bên trái của các dòng chung " +"nhau" -#: src/diff.c:861 -#, fuzzy +#: src/diff.c:864 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Không xuất _dòng chung_ nào (_thu hồi_)." +msgstr " --suppress-common-lines không kết xuất các dòng chung nhau" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" +"-p, --show-c-function hiển thị cái mà từng hàm C thay đổi ở trong" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" -msgstr "" +msgstr "-F, --show-function-line=RE hiển thị những dòng gần nhất khớp với RE" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" +" --label NHÃN sử dụng NHÃN thay vì tên tập tin\n" +" (có thể được lặp lại)" -#: src/diff.c:868 -#, fuzzy +#: src/diff.c:871 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t --expand-tabs _Mộ trộng ký tự tab_ ra ký tự cách riêng trong dữ liệu " -"xuất." +"-t, --expand-tabs mở rộng ký tự tab ra ký tự khoảng cách khi kết " +"xuất" -#: src/diff.c:869 -#, fuzzy +#: src/diff.c:872 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Sắp xếp tất cả ký tự tab bằng cách thêm một _tab vào " -"trước hết_." +"-T, --initial-tab sắp xếp tất cả ký tự tab bằng cách thêm\n" +" một tab vào trước" -#: src/diff.c:870 -#, fuzzy +#: src/diff.c:873 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -"--tabsize=SỐ Có điểm đừng tab sau mỗi SỐ cột đã in ra (mặc định là 8)." +" --tabsize=SỐ định khoảng cách tab sau mỗi SỐ cột đã in ra\n" +" (mặc định là 8)" -#: src/diff.c:871 -#, fuzzy +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -"--suppress-blank-empty Thu hồi khoảng cách hay cột tab đằng trước dòng kết " -"xuất trắng." +" --suppress-blank-empty thu hồi khoảng cách hay cột tab đằng trước " +"dòng kết xuất trống" -#: src/diff.c:872 -#, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" -msgstr "-l --paginate Gởi dữ liệu xuất qua `pr' để _dàn trang_ nó." +#: src/diff.c:875 +msgid "-l, --paginate pass output through 'pr' to paginate it" +msgstr "" +"-l, --paginate chuyển dữ liệu kết xuất qua “pr” để dàn trang " +"nó" -#: src/diff.c:874 -#, fuzzy +#: src/diff.c:877 msgid "" "-r, --recursive recursively compare any subdirectories found" -msgstr "-r --recursive So sánh _đệ qui_ mọi thư mục con đã tìm thấy." +msgstr "" +"-r, --recursive so sánh đệ qui mọi thư mục con đã tìm thấy" -#: src/diff.c:875 -#, fuzzy +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr " --no-dereference không theo liên kết mềm" + +#: src/diff.c:879 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file Xử lý tập tin vắng mặt là trống (_tập tin mới_)." +msgstr "-N --new-file coi tập tin vắng mặt là trống" -#: src/diff.c:876 -#, fuzzy +#: src/diff.c:880 msgid " --unidirectional-new-file treat absent first files as empty" -msgstr "" -"--unidirectional-new-file Xử lý tập tin đầu mà vắng mặt là trống (_tập tin " -"mới đơn hướng_)." +msgstr " --unidirectional-new-file coi tập tin đầu mà vắng mặt là trống" -#: src/diff.c:877 -#, fuzzy +#: src/diff.c:881 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -"--ignore-file-name-case _Bỏ qua chữ hoa/thường_ khi so sánh nhiều _tên tập " -"tin_." +" --ignore-file-name-case bỏ qua chữ HOA/thường khi so sánh nhiều tên tập " +"tin" -#: src/diff.c:878 -#, fuzzy +#: src/diff.c:882 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -"--no-ignore-file-name-case So sánh chữ hoa/thường trong _tên tập tin_ " -"(_không bỏ qua_)." +" --no-ignore-file-name-case so sánh chữ HOA/thường khi so sánh tên tập " +"tin" -#: src/diff.c:879 -#, fuzzy +#: src/diff.c:883 msgid "-x, --exclude=PAT exclude files that match PAT" -msgstr "-x MẪU --exclude=MẪU _Loại trừ_ mọi tập tin khớp với MẪU ấy." +msgstr "-x, --exclude=MẪU loại trừ các tập tin khớp với MẪU ấy" -#: src/diff.c:880 -#, fuzzy +#: src/diff.c:884 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X TẬP_TIN --exclude-from=TẬP_TIN Loại trừ mọi tập tin khớp với bất cứ mẫu " -"nào trong TẬP TIN ấy." +"-X, --exclude-from=TẬP_TIN loại trừ mọi tập tin khớp với bất cứ mẫu nào " +"trong TẬP TIN ấy" -#: src/diff.c:881 -#, fuzzy +#: src/diff.c:885 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -"-S TẬP_TIN --starting-file=TẬP_TIN _Bắt đầu_ với _TẬP TIN_ khi so sánh " -"nhiều thư mục." +"-S, --starting-file=TẬP_TIN bắt đầu với TẬP TIN khi so sánh nhiều thư mục" -#: src/diff.c:882 -#, fuzzy +#: src/diff.c:886 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=TẬP_TIN1 So TẬP TIN 1 với tất cả tác tử. TẬP TIN 1 có thể là " -"thư mục (_từ tập tin_)." +" --from-file=TẬP_TIN1 so TẬP TIN 1 với tất cả toán hạng;\n" +" TẬP TIN 1 có thể là thư mục" -#: src/diff.c:884 -#, fuzzy +#: src/diff.c:888 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=TẬP_TIN2 So tất cả tác tử với TẬP TIN 2. TẬP TIN 2 có thể là thư " -"mục (_vào tập tin_)." +" --to-file=TẬP_TIN2 So tất cả toán hạng với TẬP TIN 2;\n" +" TẬP TIN 2 có thể là thư mục" -#: src/diff.c:887 -#, fuzzy +#: src/diff.c:891 msgid "" "-i, --ignore-case ignore case differences in file contents" -msgstr "-i --ignore-case _Bỏ qua chữ hoa/thường_ trong nội bộ tập tin." +msgstr "" +"-i, --ignore-case không phân biệt chữ HOA/thường trong nội " +"dung tập tin" -#: src/diff.c:888 -#, fuzzy +#: src/diff.c:892 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" -msgstr "-E --ignore-tab-expansion _Bỏ qua_ mọi thay đổi do _mở rộng tab_." +msgstr "-E, --ignore-tab-expansion bỏ qua mọi thay đổi do mở rộng tab" -#: src/diff.c:889 -#, fuzzy +#: src/diff.c:893 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space _Bỏ qua tất cả dấu cách_." +msgstr "-Z, --ignore-trailing-space bỏ qua tất cả dấu cách ở cuối dòng" -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:894 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change _Bỏ qua số dấu cách thay đổi_." +msgstr "" +"-b, --ignore-space-change bỏ qua thay đổi gây ra bởi nhóm dấu cách" -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:895 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space _Bỏ qua tất cả dấu cách_." +msgstr "-w, --ignore-all-space bỏ qua tất cả dấu cách" -#: src/diff.c:892 -#, fuzzy +#: src/diff.c:896 msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines _Bỏ qua dòng trống_ thay đổi." +"-B, --ignore-blank-lines ignore changes where lines are all blank" +msgstr "-B, --ignore-blank-lines bỏ qua thay đổi do dòng trống" -#: src/diff.c:893 src/sdiff.c:178 -#, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" -msgstr "-I RE --ignore-matching-lines=RE _Bỏ qua mọi dòng khớp_ với RE." +#: src/diff.c:897 +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE bỏ qua thay đổi do mà mọi dòng khớp với RE" -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:899 msgid "-a, --text treat all files as text" -msgstr "-a --text Xử lý mọi tập tin là _văn bản_." +msgstr "-a, --text xử lý mọi tập tin là văn bản thường" -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:900 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr Tước ký tự về đầu dòng (cr) theo sau khi gõ." +msgstr "" +" --strip-trailing-cr cắt bỏ ký tự về đầu dòng (cr) theo sau khi gõ" -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:902 msgid " --binary read and write data in binary mode" -msgstr "--binary Đọc và ghi dữ liệu bằng chế độ nhị phân." +msgstr "" +" --binary đọc và ghi dữ liệu trong chế độ nhị phân" -#: src/diff.c:901 -#, fuzzy +#: src/diff.c:905 msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D TÊN --ifdef=TÊN Xuất tập tin đã hợp nhất để hiển thị dữ liệu khác biệt " -"`#ifdef TÊN'." +"-D, --ifdef=TÊN kết xuất tập tin đã trộn với khác biệt " +"“#ifdef TÊN”" -#: src/diff.c:902 -#, fuzzy +#: src/diff.c:906 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" -msgstr "" -"--LOẠIN-group-format=DẠNGN Tương tự, nhưng mà _định dạng nhóm_ gõ LOẠIN với " -"DẠNGN." +msgstr " --GTYPE-group-format=GFMT định dạng nhập GTYPE với GFMT " -#: src/diff.c:903 -#, fuzzy +#: src/diff.c:907 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -"--line-format=DẠNGD Tương tự, nhưng mà _định dạng_ mọi _dòng_ gõ với DẠNGD." +" --line-format=LFMT định dạng tất cảc các dòng vào với LFMT" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:908 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" -msgstr "" -"--LOẠID-line-format=DẠNGD Tương tự, nhưng mà _định dạng dòng_ gõ LOẠID vớI " -"DẠNGD." +msgstr " --LTYPE-line-format=LFMT định dạng nhập LTYPE với LFMT" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +" Nhưng tùy chọn đó điểu khiển kết xuất ra định dạng diff\n" +" đẹp hơn, khái quát hóa -D/--ifdef." -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LOẠID là `cũ', `mới', hay `chưa thay đổi'. LOẠIN là LOẠID hay `thay đổi " -"rồi'." +" LTYPE là “cũ”, “mới”, hoặc “chưa thay đổi”. GTYPE là LTYPE hoặc “thay đổi " +"rồi”." -#: src/diff.c:908 -#, fuzzy +#: src/diff.c:912 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -984,33 +962,31 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -"DẠNGN có thể chứa:\n" -" %< dòng từ TẬP_TIN1\n" -" %> dòng từ TẬP_TIN2\n" -" %= dòng chung của TẬP_TIN1 và TẬP_TIN2\n" -" %[-][ĐỘ_RỘNG][.[PREC]]{doxX}CHỮ dữ liệu ghi rõ dạng printf cho chữ ấy\n" -" CHỮ thường cho nhóm củ, CHỮ như theo cho nhóm mới:\n" -" F số dòng đầu\n" -" L số dòng cuối cùng\n" -" N tổng số dòng = L-F+1\n" -" E F-1\n" -" M L+1" - -#: src/diff.c:920 -#, fuzzy +" GFMT chỉ có thể chứa:\n" +" %< dòng từ TẬP_TIN1\n" +" %> dòng từ TẬP_TIN2\n" +" %= dòng chung của TẬP_TIN1 và TẬP_TIN2\n" +" %[-][ĐỘ_RỘNG][.[PREC]]{doxX}CHỮ dạng printf cho CHỮ ấy\n" +" CHỮ HOA cho nhóm mới, chữ thường cho nhóm cũ:\n" +" F số dòng đầu\n" +" L số dòng cuối cùng\n" +" N tổng số dòng = L-F+1\n" +" E F-1\n" +" M L+1 %(A=B?T:E) nếu A bằng B thì T nếu không thì E" + +#: src/diff.c:924 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -"DẠNGD có thể chứa:\n" -" %L nội dung của dòng\n" -" %l nội dung của dòng, loại trừ ký tự dòng mới nào đi theo\n" -" %[-][ĐỘ_RỘNG][.[PREC]]{doxX}n dữ liệu ghi rõ dạng printf cho số dong gõ" +" LFMT chỉ có thể chứa:\n" +" %L nội dung của dòng\n" +" %l nội dung của dòng, loại trừ ký tự dòng mới nào đi theo\n" +" %[-][Đ_RỘNG][.[PREC]]{doxX}n đặc tả dạng printf cho số dòng đầu vào" -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:928 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1018,104 +994,103 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -"Hoặc DẠNGN hoặc DẠNGD có thể chứa:\n" -" %% %\n" -" %c'C' ký tự riêng lẻ C\n" -" %c'\\OOO' ký tự có mã bát phân OOO" +" Cả GFMT và LFMT có thể chứa:\n" +" %% %\n" +" %c'C' ký tự riêng lẻ C\n" +" %c'\\OOO' ký tự có mã bát phân OOO\n" +" C ký tự C (các ký tự khác đại diện cho chính chúng)" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:934 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Cố tìm một bộ thay đổi nhỏ hơn (_tối thiểu_)." +msgstr "-d, --minimal cố tìm một thay đổi nhỏ" -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:935 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" -msgstr "--horizon-lines=SỐ Giữ SỐ _dòng_ của phụ tổ chung (_tầm nhận thức_)." +msgstr " --horizon-lines=SỐ giữ SỐ dòng của tiền tố và hậu tố chung" -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:936 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" -"-H --speed-large-files Giả định _tập tin lớn_ và nhiều thay đổi nhỏ rải " -"rác (_tốc độ_)." +" --speed-large-files giả định tập tin lớn và nhiều thay đổi nhỏ rải rác" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" -msgstr "" +msgstr " --help hiển thị trợ giúp này rồi thoát" -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:939 msgid "-v, --version output version information and exit" -msgstr "-v --version Xuất thông tin _phiên bản_." +msgstr "-v, --version đưa ra thông tin phiên bản rồi thoát" -#: src/diff.c:937 +#: src/diff.c:941 msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" -"(NHIỀU) TẬP TIN là `TẬP_TIN1 TẬP_TIN2' hay `THƯ_MỤC1 THƯ_MỤC2' hay `THƯ_MỤC " -"TẬP_TIN...' hay `TẬP_TIN... THƯ_MỤC'." +"(CÁC) TẬP TIN là “TẬP_TIN1 TẬP_TIN2” hoặc “THƯ_MỤC1 THƯ_MỤC2” hoặc “THƯ_MỤC " +"TẬP_TIN...” hay “TẬP_TIN... THƯ_MỤC”." -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:942 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Nếu đưa ra tùy chọn --from-file (từ tập tin) hay --to-file (vào tập tin) thì " "không có giới hạn TẬP TIN." -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." -msgstr "Nếu TẬP TIN là `-' thì đọc thiết bị gõ chuẩn." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +msgid "If a FILE is '-', read standard input." +msgstr "Nếu TẬP-TIN là “-”, thì đọc từ đầu vào tiêu chuẩn." -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" -msgstr "Cách sử dụng: %s [TÙY_CHỌN]... TẬP_TIN\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... CÁC_TẬP_TIN\n" -#: src/diff.c:950 -#, fuzzy +#: src/diff.c:954 msgid "Compare FILES line by line." -msgstr "So sánh mỗi dòng trong nhiều tập tin." +msgstr "So sánh các TẬP-TIN theo từng dòng." -#: src/diff.c:984 +#: src/diff.c:988 #, c-format -msgid "conflicting %s option value `%s'" -msgstr "tùy chọn %s xung đột, gia trị `%s'" +msgid "conflicting %s option value '%s'" +msgstr "tùy chọn %s xung đột, giá trị “%s”" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" -msgstr "nhiều tùy chọn kiểu dạng xuất xung đột với nhau" +msgstr "nhiều tùy chọn điều khiển định dạng xuất xung đột với nhau" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "Chỉ trong %s: %s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" -msgstr "không so được `-' với thư mục" +#: src/diff.c:1192 +msgid "cannot compare '-' to a directory" +msgstr "không thể so sánh “-” với một thư mục" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" -msgstr "không hỗ trơ tùy chọn -D với thư mục" +msgstr "không hỗ trợ tùy chọn -D với thư mục" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Thư mục con chung: %s và %s\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" -msgstr "Tập tin %s là một %s còn tập tin %s là một %s.\n" +msgstr "Tập tin %s là một %s trong khi tập tin %s là một %s.\n" + +#: src/diff.c:1314 +#, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "Hai liên kết mềm %s và %s là khác nhau\n" -#: src/diff.c:1335 +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" -msgstr "Hai tập tin %s và %s là bằng nhau.\n" +msgstr "Cả %s và %s là cùng một tập tin\n" # Tên họ #. This is a proper name. See the gettext manual, section Names. @@ -1129,118 +1104,113 @@ msgid "incompatible options" msgstr "nhiều tùy chọn không tương thích với nhau" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" -msgstr "ghi rõ `-' cho hơn một tập tin gõ" +msgid "'-' specified for more than one input file" +msgstr "đã chỉ ra “-” cho nhiều hơn một tập tin đầu vào" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" -msgstr "không đọc được" +msgstr "đọc gặp lỗi" #: src/diff3.c:428 -#, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -"-A --show-all Xuất _tất cả_ thay đổi, cũng đặt mọi điều xung đột trong " -"ngoặc đơn (_hiển thị_)." +"-A, --show-all kết xuất tất cả thay đổi, đặt mọi xung đột trong " +"ngoặc đơn" #: src/diff3.c:430 -#, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed Xuất những thay đổi chưa hợp nhất từ TẬP_TIN_CŨ thành TẬP_TIN_KHÁC " -"vào TẬP_TIN_TÔI." +"-e, --ed kết xuất script ed những thay đổi hợp nhất\n" +" từ TẬP_TIN_CŨ thành TẬP_TIN_CỦA_BẠN vào " +"TẬP_TIN_TÔI." #: src/diff3.c:432 -#, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" -"-E --show-overlap Xuất nhiều thay đổi chưa hợp nhất, cũng đặt mọi điều " -"xung đột trong ngoặc đơn (_chồng lấp_)." +"-E, --show-overlap giống -e, nhưng đặt xung đột trong ngoặc đơn" #: src/diff3.c:433 -#, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -"-3 --easy-only Xuất _chỉ_ những thay đổi chưa hợp nhất và không chồng lấp " -"(_dễ_)." +"-3, --easy-only giống -e, nhưng chỉ sát nhập những thay đổi " +"không chồng lấp" #: src/diff3.c:434 -#, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only Xuất _chỉ_ những thay đổi _chồng lấp_." +msgstr "" +"-x, --overlap-only giống -e, nhưng chỉ sát nhập những thay đổi bị " +"chồng lấp" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" msgstr "" -"-E --show-overlap Xuất nhiều thay đổi chưa hợp nhất, cũng đặt mọi điều " -"xung đột trong ngoặc đơn (_chồng lấp_)." +"-X giống -x, nhưng đặt xung đột trong ngoặc đơn" #: src/diff3.c:436 -#, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" -msgstr "-i Phụ thêm hai lệnh `w' và `q' vào mọi tập lệnh loại ed." +msgid "-i append 'w' and 'q' commands to ed scripts" +msgstr "" +"-i nối thêm hai lệnh “w” và “q” vào văn lệnh ed" #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge kết xuất tập tin đã thực tế được hòa trộn, tuân " +"theo\n" +" tùy chọn -A nếu như không có tùy chọn khác " +"được chỉ ra" #: src/diff3.c:441 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text Xử lý mọi tập tin là _văn bản_." +msgstr "-a, --text coi mọi tập tin là văn bản thường" #: src/diff3.c:442 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr Tước ký tự về đầu dòng (cr) theo sau khi gõ." +msgstr "" +" --strip-trailing-cr cắt bỏ ký tự về đầu dòng (cr) theo sau khi nhập" #: src/diff3.c:443 -#, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab Sắp xếp tất cả ký tự tab bằng cách thêm một _tab vào " -"trước hết_." +"-T, --initial-tab tạo khoảng tab cho dòng bằng cách thêm một tab " +"vào trước" #: src/diff3.c:444 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=CHƯƠNG_TRÌNH Sử dụng _chương trình_ ấy để so sánh nhiều tập " -"tin (_khác biệt_)." +" --diff-program=CHƯƠNG_TRÌNH dùng CHƯƠNG_TRÌNH để so sánh các tập tin" #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=NHÃN sử dụng NHÃN thay vì tên tập tin\n" +" (có thể lặp lại đến ba lần)" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text Xử lý mọi tập tin là _văn bản_." +msgstr " --help hiển thị trợ giúp này rồi thoát" #: src/diff3.c:449 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version Xuất thông tin _phiên bản_." +msgstr "-v, --version đưa ra thông tin phiên bản rồi thoát" #: src/diff3.c:458 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -msgstr "Cách sử dụng: %s [TÙY_CHỌN]... TẬP_TIN_TÔI TẬP_TIN_CŨ TẬP_TIN_KHÁC\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN_TÔI TẬP_TIN_CŨ TẬP_TIN_BẠN\n" #: src/diff3.c:460 msgid "Compare three files line by line." -msgstr "So sánh mỗi dong trong ba tâp tin." +msgstr "So sánh ba tập tin từng dòng một." #: src/diff3.c:470 msgid "" @@ -1255,11 +1225,23 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"Định dạng kết xuất mặc định là hơi khó để con người có thể đọc được\n" +"các thay đổi là gì.\n" +"\n" +"Tùy chọn -e, -E, -x, -X (tương ứng với dạng dài) là căn nguyên kết xuất " +"dạng\n" +"bó lệnh ed thay vì kiểu mặc định.\n" +"\n" +"Cuối cùng, tùy chọn -m (--merge) là căn nguyên diff3 thực hiện việc trộn từ " +"nội tại\n" +"và kết xuất là tập tin đã được trộn. Với kiểu đầu vào ít dùng, đây là cách\n" +"hợp lý hơn sử dụng ed.\n" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" -"Tính trạng thoát là số 0 nếu thành công, số 1 nếu có xung đột nào và số 2 " +"Trạng thái thoát là số 0 nếu thành công, số 1 nếu có xung đột nào và số 2 " "nếu gặp lỗi." #: src/diff3.c:675 @@ -1269,44 +1251,43 @@ msgstr "gặp lỗi nội bộ: không định dạng khối khác biệt đư #: src/diff3.c:968 #, c-format msgid "%s: diff failed: " -msgstr "%s: không khác biệt được:" +msgstr "%s: diff gặp lỗi: " #: src/diff3.c:990 msgid "internal error: invalid diff type in process_diff" msgstr "" -"gặp lỗi nội bộ: loại khác biệt không hợp lệ trong process_diff (xử lý khac " +"gặp lỗi nội bộ: loại khác biệt không hợp lệ trong process_diff (xử lý khác " "biệt)" #: src/diff3.c:1015 msgid "invalid diff format; invalid change separator" -msgstr "" -"khuôn dạng khác biệt không hợp lệ; điều ngăn cách thay đổi không hợp lê" +msgstr "khuôn dạng diff không hợp lệ; ký tự ngăn cách thay đổi không hợp lê" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" -msgstr "khuôn dang khác biệt không hợp lệ; chưa xong dòng cuối cùng" +msgstr "khuôn dạng diff không hợp lệ; chưa xong dòng cuối cùng" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 #, c-format -msgid "subsidiary program `%s' could not be invoked" -msgstr "không gọi được chương trình phụ `%s" +msgid "subsidiary program '%s' could not be invoked" +msgstr "không gọi được chương trình phụ trợ “%s”" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "khuôn dạng khác biệt không hợp lệ; ký tự đi trước dòng là không đúng" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" -msgstr "gặp lỗi nội bộ: gởi xuất loại khác biệt không hợp lệ" +msgstr "gặp lỗi nội bộ: kiểu diff không hợp lệ được chuyển qua cho kết xuất" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" -msgstr "tập tin gõ là co lại" +msgstr "tập tin đầu vào co lại" #: src/dir.c:158 #, c-format -msgid "cannot compare file names `%s' and `%s'" -msgstr "không so sánh được hai tập tin `%s' và `%s'" +msgid "cannot compare file names '%s' and '%s'" +msgstr "không so sánh được hai tập tin “%s” và “%s”" #: src/dir.c:209 #, c-format @@ -1319,137 +1300,126 @@ msgstr "%s: vòng lặp thư mục đệ quy" msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:170 -#, fuzzy +#: src/sdiff.c:173 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" -"-o TẬP_TIN --output=TẬP_TIN Thực hiện một cách tương tác thì _xuất dữ " -"liệu_ vào TÂP TIN." +"-o, --output=TẬP_TIN Thực hiện một cách tương tác, gửi kết xuất ra " +"TẬP-TIN" -#: src/sdiff.c:172 -#, fuzzy +#: src/sdiff.c:175 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" -msgstr "-i --ignore-case _Bỏ qua chữ hoa/thường_: là tương tự." +msgstr "-i, --ignore-case coi chữ HOA và thường là như nhau" -#: src/sdiff.c:173 -#, fuzzy +#: src/sdiff.c:176 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" -msgstr "-E --ignore-tab-expansion _Bỏ qua_ mọi thay đổi do _mở rộng tab_." +msgstr "-E, --ignore-tab-expansion bỏ qua mọi thay đổi do mở rộng tab" -#: src/sdiff.c:174 -#, fuzzy +#: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space _Bỏ qua tất cả dấu cách_." +msgstr "-Z, --ignore-trailing-space bỏ qua tất cả dấu cách ở cuối dòng" -#: src/sdiff.c:175 -#, fuzzy +#: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b --ignore-space-change _Bỏ qua số dấu cách thay đổi_." +msgstr "-b, --ignore-space-change bỏ qua thay đổi gây ra bởi nhóm dấu cách" -#: src/sdiff.c:176 -#, fuzzy +#: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space _Bỏ qua tất cả dấu cách_." +msgstr "-W, --ignore-all-space bỏ qua tất cả dấu cách" -#: src/sdiff.c:177 -#, fuzzy +#: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines _Bỏ qua dòng trống_ thay đổi." +msgstr "-B, --ignore-blank-lines bỏ qua thay đổi do đó là dòng trống" -#: src/sdiff.c:179 -#, fuzzy +#: src/sdiff.c:181 +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I, --ignore-matching-lines=RE bỏ qua thay đổi do mà mọi dòng khớp với RE" + +#: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr Tước ký tự về đầu dòng (cr) theo sau khi gõ." +msgstr "" +" --strip-trailing-cr cắt bỏ ký tự về đầu dòng (cr) theo sau khi gõ" -#: src/sdiff.c:180 -#, fuzzy +#: src/sdiff.c:183 msgid "-a, --text treat all files as text" -msgstr "-a --text Xử lý mọi tập tin là _văn bản_." +msgstr "-a, --text coi mọi tập tin là văn bản thường" -#: src/sdiff.c:182 -#, fuzzy +#: src/sdiff.c:185 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w SỐ --width=SỐ Xuất tối đa SỐ cột đã in ra (mặc định là 130) (_độ rộng_)." +"-w, --width=SỐ kết xuất tối đa SỐ cột đã in ra (mặc định là " +"130)" -#: src/sdiff.c:183 -#, fuzzy +#: src/sdiff.c:186 msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column Xuất chỉ _cột bên trái_ của mọi dòng chung." +msgstr "" +"-l, --left-column kết xuất chỉ cột bên trái của các dòng chung " +"nhau" -#: src/sdiff.c:184 -#, fuzzy +#: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines Không xuất _dòng chung_ nào (_thu hồi_)." +msgstr "-s, --suppress-common-lines không kết xuất các dòng chung nhau" -#: src/sdiff.c:186 -#, fuzzy +#: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t --expand-tabs _Mộ trộng ký tự tab_ ra ký tự cách riêng trong dữ liệu " -"xuất." +"-t, --expand-tabs mở rộng ký tự tab ra ký tự khoảng trắng khi kết " +"xuất" -#: src/sdiff.c:187 -#, fuzzy +#: src/sdiff.c:190 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" -"--tabsize=SỐ Có điểm đừng tab sau mỗi SỐ cột đã in ra (mặc định là 8)." +" --tabsize=SỐ điểm đừng tab sau mỗi SỐ cột đã in ra (mặc định " +"là 8)" -#: src/sdiff.c:189 -#, fuzzy +#: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal Cố tìm một bộ thay đổi nhỏ hơn (_tối thiểu_)." +msgstr "-d, --minimal cố tìm một thay đổi nhỏ" -#: src/sdiff.c:190 -#, fuzzy +#: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H --speed-large-files Giả định _tập tin lớn_ và nhiều thay đổi nhỏ rải " -"rác (_tốc độ_)." +"-H, --speed-large-files giả sử tập tin lớn, nhiều thay đổi nhỏ rải rác" -#: src/sdiff.c:191 -#, fuzzy +#: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=CHƯƠNG_TRÌNH Sử dụng _chương trình_ ấy để so sánh nhiều tập " -"tin (_khác biệt_)." +" --diff-program=CHƯƠNG_TRÌNH sử dụng CHƯƠNG_TRÌNH ấy để so sánh các tập " +"tin" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text Xử lý mọi tập tin là _văn bản_." +msgstr " --help hiển thị trợ giúp này rồi thoát" -#: src/sdiff.c:194 -#, fuzzy +#: src/sdiff.c:197 msgid "-v, --version output version information and exit" -msgstr "-v --version Xuất thông tin _phiên bản_." +msgstr "-v, --version đưa ra thông tin phiên bản rồi thoát" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Cách sư dụng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n" -#: src/sdiff.c:205 -#, fuzzy +#: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Hợp nhất thay đổi tập tin một cách cạnh nhau." +msgstr "Hòa trộn những khác biệt TỆP_TIN1 VÀ TỆP_TIN2 cạnh nhau." -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "không hợp nhất được dữ liệu gõ chuẩn một cách tương tác" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" -msgstr "cả hai tập tin để so sánh là thư mục" +msgstr "cả hai tập tin dùng để so sánh đều là thư mục" -#: src/sdiff.c:827 +#: src/sdiff.c:818 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1462,15 +1432,15 @@ msgid "" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr "" -"ed:\tHiệu chinh rồi sử dụng cả hai phiên bản; nhãn mỗi điều với dòng đầu.\n" -"eb:\tHiệu chinh rồi sử dụng cả hai phiên bản.\n" -"el hay e1:\tHiệu chinh rồi sử dụng phiên bản bên trái.\n" -"er hay e2:\tHiệu chinh rồi sử dụng phiên bản bên phải.\n" -"e:\tHủy cả hai phiên bản rồi hiệu chỉnh một phiên bản mới.\n" -"l hay 1:\tSử dụng phiên bản bên trái..\n" +"ed:\tSửa rồi sử dụng cả hai phiên bản; mỗi cái gắn thêm phần đầu.\n" +"eb:\tSửa rồi sử dụng cả hai phiên bản.\n" +"el hay e1:\tSửa rồi sử dụng phiên bản bên trái.\n" +"er hay e2:\tSửa rồi sử dụng phiên bản bên phải.\n" +"e:\tHủy cả hai phiên bản rồi sửa một phiên bản mới.\n" +"l hay 1:\tSử dụng phiên bản bên trái.\n" "r hay 2:\tSử dụng phiên bản bên phải.\n" "s:\tBao gồm dòng chung nhưng không xuất chi tiết.\n" -"v:\tBao gồm dòng chung một cách chi tiết.\n" +"v:\tBao gồm dòng chung xuất một cách chi tiết.\n" "q:\tThoát.\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" @@ -1481,49 +1451,15 @@ msgstr "" #~ "-s --quiet --silent Không xuất gì; chỉ hiển thị tính trạng thoát thôi " #~ "(_im_)." -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version Xuất thông tin _phiên bản_." - #~ msgid "--help Output this help." #~ msgstr "--help Xuất _trợ giúp_ này." -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "So sánh mỗi dong trong ba tâp tin." - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion _Bỏ qua_ mọi thay đổi do _mở rộng tab_." - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change _Bỏ qua số dấu cách thay đổi_." - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space _Bỏ qua tất cả dấu cách_." - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines _Bỏ qua dòng trống_ thay đổi." - -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr Tước ký tự về đầu dòng (cr) theo sau khi gõ." - -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text Xử lý mọi tập tin là _văn bản_." - -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1536,10 +1472,6 @@ msgstr "" #~ " -F RE --show-function-line=RE \n" #~ "\t\t\t_Hiển thị dòng_ gần đây nhất mà khớp với RE (_chức năng_)." -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed Xuất tập lệnh loại ed." - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1553,39 +1485,12 @@ msgstr "" #~ " \t\t--left-column \tXuất chỉ _cột bên trái_ của dòng chung.\n" #~ " \t\t--suppress-common-lines \tKhông xuất dòng chung." -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "" -#~ "-t --expand-tabs _Mộ trộng ký tự tab_ ra ký tự cách riêng trong dữ liệu " -#~ "xuất." - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "" -#~ "-T --initial-tab Sắp xếp tất cả ký tự tab bằng cách thêm một _tab vào " -#~ "trước hết_." - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "" -#~ "--tabsize=SỐ Có điểm đừng tab sau mỗi SỐ cột đã in ra (mặc định là 8)." - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal Cố tìm một bộ thay đổi nhỏ hơn (_tối thiểu_)." - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" #~ "--speed-large-files Giả định _tập tin lớn_ và nhiều thay đổi nhỏ rải rác " #~ "(_tốc độ_)." -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "" -#~ "-A --show-all Xuất _tất cả_ thay đổi, cũng đặt mọi điều xung đột trong " -#~ "ngoặc đơn (_hiển thị_)." - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "" #~ "-X Xuất những thay đổi chồng lấp, cũng đặt mọi điều xung đột trong ngoặc " @@ -1598,55 +1503,3 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L NHÃN --label=NHÃN Sử dụng NHÃN thay thế tên tập tin." - -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "" -#~ "--diff-program=CHƯƠNG_TRÌNH Sử dụng _chương trình_ ấy để so sánh nhiều " -#~ "tập tin (_khác biệt_)." - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space _Bỏ qua tất cả dấu cách_." - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "" -#~ "-w SỐ --width=SỐ Xuất tối đa SỐ cột đã in ra (mặc định là 130) (_độ " -#~ "rộng_)." - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column Xuất chỉ _cột bên trái_ của mọi dòng chung." - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "" -#~ "--speed-large-files Giả định _tập tin lớn_ và nhiều thay đổi nhỏ rải rác " -#~ "(_tốc độ_)." - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "không đọc được" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "không ghi được" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "không đọc được" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "không đọc được" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "không ghi được" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "không ghi được" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 4f45361..4661339 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index e439d11..d53c7fe 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2004-06-05 11:37+0800\n" "Last-Translator: Yingxin Zhou <eerd003@dlut.edu.cn>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -25,7 +25,7 @@ msgstr "程序错误" msgid "stack overflow" msgstr "栈溢出" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "未知的系统错误" @@ -138,100 +138,102 @@ msgstr "%s：选项 “%s” 需要一个参数\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "成功" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "没有匹配" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "无效的正则表达式" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "无效的对照字符" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "无效的字符种类名称" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "末端有多余的反斜号" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "无效的向后引用" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "没有匹配的 [ 或 [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "没有匹配的 ( 或 \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "没有匹配的 \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} 中的内容无效" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "范围末端字符无效" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "内存耗尽" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "无效的前导正则表达式" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "正则表达式过旱结束" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "正则表达式过大" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "没有匹配的 ) 或 \\" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "之前没有任何正则表达式" @@ -263,17 +265,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "无效的 --bytes 值 `%s'" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "无效的水平长度 “%s”" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -441,7 +443,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "文件 %s 和 %s 不同\n" @@ -451,7 +453,7 @@ msgstr "文件 %s 和 %s 不同\n" msgid "Binary files %s and %s differ\n" msgstr "文件 %s 和 %s 不同\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "文件尾没有 newline 字符" @@ -465,14 +467,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "请尝试 “%s --help”，以获得更多信息。" #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "无效的 --ignore-initial 值 “%s”" #: src/cmp.c:147 @@ -480,14 +482,14 @@ msgstr "无效的 --ignore-initial 值 “%s”" msgid "options -l and -s are incompatible" msgstr "选项 -l 和 -s 不兼容" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "写入失败" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "标准输出" @@ -548,7 +550,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "SKIP1 和 SKIP2分别是每个文件要略过的字节数。" -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -564,26 +566,27 @@ msgstr "" "还有 T、P、E、Z、Y 如此类推。" #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "如果文件是 “-” 或没给出，则从标准输入读入内容。" -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "如果输入相同，则退出状态为 0；1 表示输入不同；2 表示有错误产生。" #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "无效的 --bytes 值 `%s'" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "操作数 “%s” 后缺少参数" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "多余的操作数 “%s”" #: src/cmp.c:491 @@ -602,216 +605,218 @@ msgid "cmp: EOF on %s\n" msgstr "cmp：%s 已结束\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "无效的上下文行数 “%s”" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "此系统不支持分页" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "过多的文件标号选项" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "无效的宽度 “%s”" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "宽度选项冲突" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "无效的水平长度 “%s”" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "无效的制表符宽度 “%s”" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "的制表符选项冲突" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "同时指定了选项 --from-file 和 --to-file" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal 以正常的 diff 方式输出。" -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief 只显示文件是否不同。" -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files 当两个一样时仍然显示结果。" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr "-w NUM --width=NUM 每行显示最多 NUM（默认 130）个字符。" +msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w NUM --width=NUM 每行显示最多 NUM（默认 130）个字符。" -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text 所有文件都以文本方式处理。" +msgstr "-e --ed 以 ed script 方式输出。" -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs 以 RCS diff 格式输出。" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version 输出版本信息。" +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NUM --width=NUM 每行显示最多 NUM（默认 130）个字符。" -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column 当有两行相同时只显示左边的一行。" -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines 当有两行相同时不显示。" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs 将输出中的 tab 转换成空格。" -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab 每行先加上 tab 字符，使 tab 字符可以对齐。" -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NUM 定位字符 (tab) 的宽度，默认为 8 个空格宽。" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate 将输出送至‘pr’指令来分页。" -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive 连同所有子目录一起比较。" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file 不存在的文件以空文件方式处理。" -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file 若第一文件案不存在，以空文件处理。" -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case 忽略文件名大小写的区别。" -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "--no-ignore-file-name-case 不忽略文件名大小写的区别。" -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT 排除匹配 PAT 的文件。" -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X FILE --exclude-from=FILE 排除所有匹配在 FILE 中列出的模式的文件。" -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S FILE --starting-file=FILE 当比较目录時，由 FILE 开始比较。" -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -820,7 +825,7 @@ msgstr "" "--from-file=FILE1 将 FILE1 和操作数中的所有文件/目录作比较。FILE1 可以是目" "录。" -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -829,97 +834,98 @@ msgstr "" "--to-file=FILE2 将操作数中的所有文件/目录和 FILE2 作比较。FILE2 可以是目" "录。" -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case 忽略文件内容大小写的区别。" -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion 忽略由制表符宽度造成的差异。" -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space 忽略所有空格。" -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change 忽略由空格数不同造成的差异。" -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space 忽略所有空格。" -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差异。" -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE 如果某行匹配正则表达式，则忽略由该行造成的" "差异。" -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有文件都以文本方式处理。" -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除输入内容每行末端的 carriage return 字符。" -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "以二进制方式读写数据。" -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "-D NAME --ifdef=NAME 输出的内容以‘#ifdef NAME’方式标明差异。" -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT 效果类似，但会以 GFMT 格式处理 GTYPE 输入的行。" -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT 效果类似，但会以 LFMT 格式处理每一行资料。" -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT 效果类似，但会以 LFMT 格式处理 LTYPE 输入的行。" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE 可以是‘old’、‘new’或‘unchanged’。GTYPE 可以是 LTYPE 的选择\n" " 或是‘changed’。" -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -947,7 +953,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -960,7 +966,7 @@ msgstr "" " %l 该行的内容，但不包括结束的 newline 字符\n" " %[-][宽度][.[精确度]]{doxX}n 以 printf 格式表示的输入资料行号" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -974,92 +980,100 @@ msgstr "" " %c'C' 字符 C\n" " %c'\\OOO' 八进制数字 OOO 所代表的字符" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal 尽可能找出最小的差异。" -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM (此选项不做处理)" -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "-H --speed-large-files 假设文件十分大而且文件中含有许多微小的差异。" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 输出版本信息。" -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FILES 的格式可以是‘FILE1 FILE2’、‘DIR1 DIR2’、‘DIR FILE...’或\n" " ‘FILE... DIR’。" -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "如果使用 --from-file 或 --to-file 选项，FILES 的格式则不受限制。" -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "如果 FILE 是‘-’，则由标准输入读取内容。" -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "用法：%s [选项]... FILES\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "逐行比较文件。" -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "互相冲突的 %s 选项，参数值为 “%s”" -#: src/diff.c:997 +#: src/diff.c:1001 #, fuzzy, c-format msgid "conflicting output style options" msgstr "互相冲突的输出选项 %s ，参数值为“%s”" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "只在 %s 存在：%s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "“-” 无法与目录作比较" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D 选项不支持目录使用" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s 和 %s 有共同的子目录\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "文件 %s 是%s而文件 %s 是%s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "文件 %s 和 %s 不同\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "檔案 %s 和 %s 相同\n" @@ -1075,11 +1089,12 @@ msgid "incompatible options" msgstr "不兼容的选项" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "输入文件 “-” 不可多於一个" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "读取时失败" @@ -1116,13 +1131,12 @@ msgid "" msgstr "-x --overlap-only 只输出重叠的更改部份。" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap 输出未合并的更改部份，并括上互相冲突的地方。" +msgstr "" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i 在 ed script 中附加‘w’和‘q’指令。" #: src/diff3.c:438 @@ -1158,9 +1172,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text 所有文件都以文本方式处理。" +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1211,30 +1224,30 @@ msgstr "内部错误：process_diff 中的 diff 类型无效" msgid "invalid diff format; invalid change separator" msgstr "无效的 diff 格式；表示内容改变的分隔字符串无效" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "无效的 diff 格式；最后一行不完整" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "无法调用辅助程序 “%s”" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "无效的 diff 格式；错误的行前导字符" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "内部错误：传递给输出的 diff 类型无效" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "输入文件缩小" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "无法比较文件名 “%s“ 和 ”%s“" #: src/dir.c:209 @@ -1247,127 +1260,133 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o 文件 --output=文件 交互式操作，并将结果写入至<文件>。" -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case 忽略大写和小写的区别。" -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion 忽略由制表符宽度造成的差异。" -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space 忽略所有空格。" -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change 忽略由空格数不同造成的差异。" -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space 忽略所有空格。" +msgstr "-W --ignore-all-space 忽略所有空白字符。" -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差异。" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE 如果某行匹配正则表达式，则忽略由该行造成的" +"差异。" + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除输入内容每行末端的 carriage return 字符。" -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有文件都以文本方式处理。" -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NUM --width=NUM 每行显示最多 NUM（默认 130）个字符。" -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column 当有两行相同时只显示左边的一行。" -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines 当有两行相同时不显示。" -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs 将输出中的 tab 转换成空格。" -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=NUM 定位字符 (tab) 的宽度，默认为 8 个空格宽。" -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal 尽可能找出最小的差异。" -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "-H --speed-large-files 假设文件十分大而且文件中含有许多微小的差异。" -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=程序 用<程序>来比较文件。" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text 所有文件都以文本方式处理。" +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 输出版本信息。" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "用法：%s [选项]... 文件1 文件2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "以并排方式合并文件之间的差异。" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "不允許以交互方式合并标准输入的内容" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "两个要被比较的文件都是目录" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1392,55 +1411,42 @@ msgstr "" "v ：\t加上两边一样的行时会在输出上显示。\n" "q ：\t退出。\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s：非法选项 -- %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "本程序是自由软件;请参看源代码的版权声明。本软件不提供任何保证;\n" +#~ "即使是商业的或为某一专用目的适用性保证也没有。\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent 无任何输出；只产生退出状态。" -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version 输出版本信息。" - #~ msgid "--help Output this help." #~ msgstr "--help 输入本帮助。" -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "逐行比较三个文件。" - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion 忽略由制表符宽度造成的差异。" - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change 忽略由空格数不同造成的差异。" - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space 忽略所有空白字符。" - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差异。" +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "请向 <bug-gnu-utils@gnu.org> 报告错误。" -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "--strip-trailing-cr 去除输入内容每行末端的 carriage return 字符。" +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "“-%ld” 选项已过时；请使用 “-%c %ld”" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text 所有文件都以文本方式处理。" +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "“-%ld” 选项已过时；忽略之" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1452,10 +1458,6 @@ msgstr "" #~ " -p --show-c-function 显示和每个差异有关的 C 函数名称。\n" #~ " -F RE --show-function-line=RE 显示最接近而符合<正则表示式>的一行。" -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed 以 ed script 方式输出。" - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1467,30 +1469,10 @@ msgstr "" #~ " --left-column 当有两行相同时只显示左边的一行。\n" #~ " --suppress-common-lines 当有两行相同时不会显示。" -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs 将输出中的 tab 转换成空格。" - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab 每行先加上 tab 字符，使 tab 字符可以对齐。" - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=NUM 定位字符 (tab) 的宽度，默认为 8 个空格宽。" - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal 尽可能找出最小的差异。" - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "--speed-large-files 假设文件十分大而且其中含有许多微小的差异。" -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all 输出所有要更改的部份，并括上互相冲突的地方。" - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X 输出重叠的更改部份，并加上括号。" @@ -1500,73 +1482,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L 标识 --label=标识 以<标识>代替文件名称。" -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=程序 用<程序>来比较文件。" - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space 忽略所有空白字符。" - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "-w NUM --width=NUM 每行显示最多 NUM（默认 130）个字符。" - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column 当有两行相同时只显示左边的一行。" - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "--speed-large-files 假设文件十分大而且其中含有许多微小的差异。" - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "读取时失败" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "写入失败" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "读取时失败" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "读取时失败" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "写入失败" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "写入失败" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s：非法选项 -- %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "本程序是自由软件;请参看源代码的版权声明。本软件不提供任何保证;\n" -#~ "即使是商业的或为某一专用目的适用性保证也没有。\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "请向 <bug-gnu-utils@gnu.org> 报告错误。" - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "“-%ld” 选项已过时；请使用 “-%c %ld”" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "“-%ld” 选项已过时；忽略之" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "找不到辅助程序 “%s”" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex dea6f8f..83f6abb 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index 665ab25..b9bae34 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2011-09-02 17:19+0200\n" +"POT-Creation-Date: 2013-03-24 11:05-0700\n" "PO-Revision-Date: 2005-04-01 14:31+0800\n" "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -23,7 +23,7 @@ msgstr "程式錯誤" msgid "stack overflow" msgstr "堆疊溢位" -#: lib/error.c:185 +#: lib/error.c:188 msgid "Unknown system error" msgstr "不明的系統錯誤" @@ -136,100 +136,102 @@ msgstr "%s：選項‘%s’需要參數\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs> +#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:271 +#: lib/quotearg.c:312 msgid "`" msgstr "" -#: lib/quotearg.c:272 +#: lib/quotearg.c:313 msgid "'" msgstr "" -#: lib/regcomp.c:133 +#: lib/regcomp.c:131 msgid "Success" msgstr "成功" -#: lib/regcomp.c:136 +#: lib/regcomp.c:134 msgid "No match" msgstr "沒有符合的字串" -#: lib/regcomp.c:139 +#: lib/regcomp.c:137 msgid "Invalid regular expression" msgstr "不正確的正規表示式" -#: lib/regcomp.c:142 +#: lib/regcomp.c:140 msgid "Invalid collation character" msgstr "無效的 collation 字元" -#: lib/regcomp.c:145 +#: lib/regcomp.c:143 msgid "Invalid character class name" msgstr "無效的字元種類名稱" -#: lib/regcomp.c:148 +#: lib/regcomp.c:146 msgid "Trailing backslash" msgstr "末端有多餘的反斜號" -#: lib/regcomp.c:151 +#: lib/regcomp.c:149 msgid "Invalid back reference" msgstr "無效的 back reference" -#: lib/regcomp.c:154 +#: lib/regcomp.c:152 msgid "Unmatched [ or [^" msgstr "沒有對應的 [ 或 [^" -#: lib/regcomp.c:157 +#: lib/regcomp.c:155 msgid "Unmatched ( or \\(" msgstr "沒有對應的 ( 或 \\(" -#: lib/regcomp.c:160 +#: lib/regcomp.c:158 msgid "Unmatched \\{" msgstr "沒有對應的 \\{" -#: lib/regcomp.c:163 +#: lib/regcomp.c:161 msgid "Invalid content of \\{\\}" msgstr "\\{\\} 中的內容無效" -#: lib/regcomp.c:166 +#: lib/regcomp.c:164 msgid "Invalid range end" msgstr "範圍末端字元無效" -#: lib/regcomp.c:169 +#: lib/regcomp.c:167 msgid "Memory exhausted" msgstr "記憶體耗盡" -#: lib/regcomp.c:172 +#: lib/regcomp.c:170 msgid "Invalid preceding regular expression" msgstr "之前的正規表示式無效" -#: lib/regcomp.c:175 +#: lib/regcomp.c:173 msgid "Premature end of regular expression" msgstr "正規表示式過早結束" -#: lib/regcomp.c:178 +#: lib/regcomp.c:176 msgid "Regular expression too big" msgstr "正規表示式過長" -#: lib/regcomp.c:181 +#: lib/regcomp.c:179 msgid "Unmatched ) or \\)" msgstr "沒有對應的 ) 或 \\)" -#: lib/regcomp.c:702 +#: lib/regcomp.c:704 msgid "No previous regular expression" msgstr "之前沒有任何正規表示式" @@ -261,17 +263,17 @@ msgstr "" #: lib/xstrtol-error.c:63 #, fuzzy, c-format -msgid "invalid %s%s argument `%s'" +msgid "invalid %s%s argument '%s'" msgstr "無效的 --bytes 值 ‘%s’" #: lib/xstrtol-error.c:68 -#, fuzzy, c-format -msgid "invalid suffix in %s%s argument `%s'" -msgstr "無效的水平長度 ‘%s’" +#, c-format +msgid "invalid suffix in %s%s argument '%s'" +msgstr "" #: lib/xstrtol-error.c:72 #, c-format -msgid "%s%s argument `%s' too large" +msgid "%s%s argument '%s' too large" msgstr "" #: lib/version-etc.c:74 @@ -439,7 +441,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:459 src/diff.c:1279 +#: src/analyze.c:459 src/diff.c:1343 #, c-format msgid "Files %s and %s differ\n" msgstr "檔案 %s 與 %s 不同\n" @@ -449,7 +451,7 @@ msgstr "檔案 %s 與 %s 不同\n" msgid "Binary files %s and %s differ\n" msgstr "二元碼檔 %s 與 %s 不同\n" -#: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 +#: src/analyze.c:713 src/diff3.c:1416 src/util.c:663 msgid "No newline at end of file" msgstr "檔案末沒有 newline 字元" @@ -463,14 +465,14 @@ msgstr "Torbjorn Granlund" msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 -#, c-format -msgid "Try `%s --help' for more information." +#: src/cmp.c:118 src/diff.c:839 src/diff3.c:414 src/sdiff.c:158 +#, fuzzy, c-format +msgid "Try '%s --help' for more information." msgstr "請嘗試‘%s --help’來獲取更多資訊。" #: src/cmp.c:137 -#, c-format -msgid "invalid --ignore-initial value `%s'" +#, fuzzy, c-format +msgid "invalid --ignore-initial value '%s'" msgstr "無效的 --ignore-initial 值 ‘%s’" #: src/cmp.c:147 @@ -478,14 +480,14 @@ msgstr "無效的 --ignore-initial 值 ‘%s’" msgid "options -l and -s are incompatible" msgstr "-l 和 -s 選項不兼容" -#: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 -#: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 -#: src/util.c:284 src/util.c:291 +#: src/cmp.c:155 src/diff.c:848 src/diff3.c:422 src/sdiff.c:167 +#: src/sdiff.c:315 src/sdiff.c:322 src/sdiff.c:874 src/util.c:278 +#: src/util.c:375 src/util.c:382 msgid "write failed" msgstr "寫入失敗" -#: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 -#: src/sdiff.c:166 +#: src/cmp.c:157 src/diff.c:850 src/diff.c:1408 src/diff3.c:424 +#: src/sdiff.c:169 msgid "standard output" msgstr "標準輸出" @@ -546,7 +548,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "SKIP1 和 SKIP2 是每個檔案會略過的位元組數目。" -#: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 +#: src/cmp.c:185 src/diff.c:956 src/diff3.c:462 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -562,26 +564,27 @@ msgstr "" "還有 T、P、E、Z、Y 如此類推。" #: src/cmp.c:194 -msgid "If a FILE is `-' or missing, read standard input." +#, fuzzy +msgid "If a FILE is '-' or missing, read standard input." msgstr "如果檔案是‘-’或沒有指定，則由標準輸入讀入資料。" -#: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 +#: src/cmp.c:195 src/diff.c:944 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "如果兩邊內容一樣，回傳值是 0；1 代表兩邊內容不相同，2 代表有錯誤。" #: src/cmp.c:240 -#, c-format -msgid "invalid --bytes value `%s'" +#, fuzzy, c-format +msgid "invalid --bytes value '%s'" msgstr "無效的 --bytes 值 ‘%s’" -#: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 -#, c-format -msgid "missing operand after `%s'" +#: src/cmp.c:266 src/diff.c:757 src/diff3.c:318 src/sdiff.c:565 +#, fuzzy, c-format +msgid "missing operand after '%s'" msgstr "‘%s’後缺少了參數" -#: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 -#, c-format -msgid "extra operand `%s'" +#: src/cmp.c:278 src/diff.c:759 src/diff3.c:320 src/sdiff.c:567 +#, fuzzy, c-format +msgid "extra operand '%s'" msgstr "多餘的參數‘%s’" #: src/cmp.c:491 @@ -600,215 +603,217 @@ msgid "cmp: EOF on %s\n" msgstr "cmp：%s 已結束\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:48 +#: src/diff.c:49 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Len Tower" msgstr "" -#: src/diff.c:340 -#, c-format -msgid "invalid context length `%s'" +#: src/diff.c:339 +#, fuzzy, c-format +msgid "invalid context length '%s'" msgstr "無效的上下文行數‘%s’" -#: src/diff.c:423 +#: src/diff.c:422 #, c-format msgid "pagination not supported on this host" msgstr "此系統不支援分頁" -#: src/diff.c:438 src/diff3.c:300 +#: src/diff.c:437 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "太多有關檔案標籤的選項" -#: src/diff.c:515 -#, c-format -msgid "invalid width `%s'" +#: src/diff.c:514 +#, fuzzy, c-format +msgid "invalid width '%s'" msgstr "無效的寬度‘%s’" -#: src/diff.c:519 +#: src/diff.c:518 msgid "conflicting width options" msgstr "出現互相抵觸的寬度選項" -#: src/diff.c:544 -#, c-format -msgid "invalid horizon length `%s'" +#: src/diff.c:543 +#, fuzzy, c-format +msgid "invalid horizon length '%s'" msgstr "無效的水平長度 ‘%s’" -#: src/diff.c:595 -#, c-format -msgid "invalid tabsize `%s'" +#: src/diff.c:598 +#, fuzzy, c-format +msgid "invalid tabsize '%s'" msgstr "無效的定位字元寬度 ‘%s’" -#: src/diff.c:599 +#: src/diff.c:602 msgid "conflicting tabsize options" msgstr "出現互相抵觸的定位字元寬度選項" -#: src/diff.c:731 +#: src/diff.c:734 msgid "--from-file and --to-file both specified" msgstr "同時指定了 --from-file 及 --to-file 選項" -#: src/diff.c:851 +#: src/diff.c:854 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal 以正常的 diff 方式輸出。" -#: src/diff.c:852 +#: src/diff.c:855 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief 只顯示檔案是否不同。" -#: src/diff.c:853 +#: src/diff.c:856 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files 當兩個檔案一樣時仍然顯示結果。" -#: src/diff.c:854 -#, fuzzy +#: src/diff.c:857 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" +msgstr "" -#: src/diff.c:855 +#: src/diff.c:858 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" -#: src/diff.c:856 +#: src/diff.c:859 #, fuzzy msgid "-e, --ed output an ed script" -msgstr "-a --text 所有檔案都以文字檔方式處理。" +msgstr "-e --ed 以 ed script 方式輸出。" -#: src/diff.c:857 +#: src/diff.c:860 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs 以 RCS diff 格式輸出。" -#: src/diff.c:858 -#, fuzzy +#: src/diff.c:861 msgid "-y, --side-by-side output in two columns" -msgstr "-v --version 顯示版本資訊。" +msgstr "" -#: src/diff.c:859 +#: src/diff.c:862 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" -#: src/diff.c:860 +#: src/diff.c:863 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column 當有兩行相同時只顯示左邊的一行。" -#: src/diff.c:861 +#: src/diff.c:864 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines 當有兩行相同時不會顯示。" -#: src/diff.c:863 +#: src/diff.c:866 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:864 +#: src/diff.c:867 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:865 +#: src/diff.c:868 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" -#: src/diff.c:868 +#: src/diff.c:871 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs 將輸出中的 tab 換成空格。" -#: src/diff.c:869 +#: src/diff.c:872 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab 每行先加上 tab 字元，使 tab 字元可以對齊。" -#: src/diff.c:870 +#: src/diff.c:873 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NUM 定位字元 (tab) 的寬度，預設為 8 個空格。" -#: src/diff.c:871 +#: src/diff.c:874 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:872 +#: src/diff.c:875 #, fuzzy -msgid "-l, --paginate pass output through `pr' to paginate it" +msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate 將輸出送至‘pr’指令來分頁。" -#: src/diff.c:874 +#: src/diff.c:877 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive 連同所有副目錄一起比較。" -#: src/diff.c:875 +#: src/diff.c:878 +msgid " --no-dereference don't follow symbolic links" +msgstr "" + +#: src/diff.c:879 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file 不存在的檔案以空白檔案方式處理。" -#: src/diff.c:876 +#: src/diff.c:880 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file 若第一個檔案不存在，以空白檔案處理。" -#: src/diff.c:877 +#: src/diff.c:881 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case 當比較檔案名稱時不分辨大小寫。" -#: src/diff.c:878 +#: src/diff.c:882 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "--no-ignore-file-name-case 當比較檔案名稱時會分辨大小寫。" -#: src/diff.c:879 +#: src/diff.c:883 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT 排除樣式為 PAT 的檔案。" -#: src/diff.c:880 +#: src/diff.c:884 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "-X FILE --exclude-from=FILE 排除所有在 FILE 中列出的樣式的檔案。" -#: src/diff.c:881 +#: src/diff.c:885 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S FILE --starting-file=FILE 當比較目錄時，由 FILE 開始比較。" -#: src/diff.c:882 +#: src/diff.c:886 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -816,7 +821,7 @@ msgid "" msgstr "" "--from-file=FILE1 將 FILE1 和參數中的所有檔案/目錄作比較。FILE1 可以是目錄。" -#: src/diff.c:884 +#: src/diff.c:888 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -824,96 +829,97 @@ msgid "" msgstr "" "--to-file=FILE2 將參數中的所有檔案/目錄和 FILE2 作比較。FILE2 可以是目錄。" -#: src/diff.c:887 +#: src/diff.c:891 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case 不分辨檔案內容中的大小寫。" -#: src/diff.c:888 +#: src/diff.c:892 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion 忽略因將 tab 轉換為空格而造成的差異。" -#: src/diff.c:889 +#: src/diff.c:893 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space 忽略所有空白字元。" -#: src/diff.c:890 +#: src/diff.c:894 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change 忽略因空白字元數目不同而造成的差異。" -#: src/diff.c:891 +#: src/diff.c:895 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space 忽略所有空白字元。" -#: src/diff.c:892 +#: src/diff.c:896 #, fuzzy msgid "" -"-B, --ignore-blank-lines ignore changes whose lines are all blank" +"-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差異。" -#: src/diff.c:893 src/sdiff.c:178 +#: src/diff.c:897 #, fuzzy -msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" +msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE 忽略任何符合指定的<正規表示式>的地方。" -#: src/diff.c:895 +#: src/diff.c:899 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有檔案都以文字檔方式處理。" -#: src/diff.c:896 +#: src/diff.c:900 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。" -#: src/diff.c:898 +#: src/diff.c:902 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary 以二元碼檔模式讀寫資料。" -#: src/diff.c:901 +#: src/diff.c:905 #, fuzzy msgid "" -"-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" +"-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "-D NAME --ifdef=NAME 輸出的資料以‘#ifdef NAME’方式標明差異。" -#: src/diff.c:902 +#: src/diff.c:906 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT 效果類似，但會以 GFMT 格式處理 GTYPE 輸入行組。" -#: src/diff.c:903 +#: src/diff.c:907 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT 效果類似，但會以 LFMT 格式處理每一行資料。" -#: src/diff.c:904 +#: src/diff.c:908 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT 效果類似，但會以 LFMT 格式處理 LTYPE 輸入行組。" -#: src/diff.c:905 +#: src/diff.c:909 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:907 -msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." +#: src/diff.c:911 +#, fuzzy +msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE 可以是‘old’、‘new’或‘unchanged’。GTYPE 可以是 LTYPE 的選擇\n" " 或是‘changed’。" -#: src/diff.c:908 +#: src/diff.c:912 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -941,7 +947,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:920 +#: src/diff.c:924 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -954,7 +960,7 @@ msgstr "" " %l 該行的內容，但不包括結束的 newline 字元\n" " %[-][寬度][.[精確度]]{doxX}n 以 printf 格式表示的輸入資料行號" -#: src/diff.c:924 +#: src/diff.c:928 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -968,93 +974,101 @@ msgstr "" " %c'C' 字元 C\n" " %c'\\OOO' 八進位數字 OOO 所代表的字元" -#: src/diff.c:930 +#: src/diff.c:934 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal 盡可能找出最小的差異。" -#: src/diff.c:931 +#: src/diff.c:935 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM (此選項不作處理)" -#: src/diff.c:932 +#: src/diff.c:936 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "-H --speed-large-files 假設檔案十分大而且當中含有許多些微的差異。" -#: src/diff.c:934 +#: src/diff.c:938 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:935 +#: src/diff.c:939 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 顯示版本資訊。" -#: src/diff.c:937 +#: src/diff.c:941 +#, fuzzy msgid "" -"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." +"FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'." msgstr "" "FILES 的格式可以是‘FILE1 FILE2’、‘DIR1 DIR2’、‘DIR FILE...’或\n" " ‘FILE... DIR’。" -#: src/diff.c:938 +#: src/diff.c:942 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "如果使用 --from-file 或 --to-file 選項，FILES 的格式則不受限制。" -#: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 -msgid "If a FILE is `-', read standard input." +#: src/diff.c:943 src/diff3.c:481 src/sdiff.c:219 +#, fuzzy +msgid "If a FILE is '-', read standard input." msgstr "如果 FILE 是‘-’，則由標準輸入讀取資料。" # It is intentional *not* to translate FILES -- maddog -#: src/diff.c:949 +#: src/diff.c:953 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "用法：%s [選項]... FILES\n" -#: src/diff.c:950 +#: src/diff.c:954 #, fuzzy msgid "Compare FILES line by line." msgstr "比較兩個檔案的每一行。" -#: src/diff.c:984 -#, c-format -msgid "conflicting %s option value `%s'" +#: src/diff.c:988 +#, fuzzy, c-format +msgid "conflicting %s option value '%s'" msgstr "互相矛盾的 %s 選項，參數值為‘%s’" -#: src/diff.c:997 +#: src/diff.c:1001 #, c-format msgid "conflicting output style options" msgstr "互相矛盾的輸出模式選項" -#: src/diff.c:1054 src/diff.c:1254 +#: src/diff.c:1058 src/diff.c:1268 #, c-format msgid "Only in %s: %s\n" msgstr "只在 %s 存在：%s\n" -#: src/diff.c:1183 -msgid "cannot compare `-' to a directory" +#: src/diff.c:1192 +#, fuzzy +msgid "cannot compare '-' to a directory" msgstr "‘-’無法與目錄作比較" -#: src/diff.c:1215 +#: src/diff.c:1227 msgid "-D option not supported with directories" msgstr "-D 選項不可配合目錄使用" -#: src/diff.c:1224 +#: src/diff.c:1236 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s 和 %s 有共同的副目錄\n" -#: src/diff.c:1264 +#: src/diff.c:1278 src/diff.c:1328 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "檔案 %s 是%s而檔案 %s 是%s\n" -#: src/diff.c:1335 +#: src/diff.c:1314 +#, fuzzy, c-format +msgid "Symbolic links %s and %s differ\n" +msgstr "檔案 %s 與 %s 不同\n" + +#: src/diff.c:1399 #, c-format msgid "Files %s and %s are identical\n" msgstr "檔案 %s 和 %s 相同\n" @@ -1070,11 +1084,12 @@ msgid "incompatible options" msgstr "不兼容的選項" #: src/diff3.c:353 -msgid "`-' specified for more than one input file" +#, fuzzy +msgid "'-' specified for more than one input file" msgstr "輸入檔‘-’不可多於一個" -#: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 -#: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 +#: src/diff3.c:395 src/diff3.c:1241 src/diff3.c:1645 src/diff3.c:1700 +#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "讀取資料失敗" @@ -1111,13 +1126,12 @@ msgid "" msgstr "-x --overlap-only 只顯示重疊的更改部份。" #: src/diff3.c:435 -#, fuzzy msgid "-X like -x, but bracket conflicts" -msgstr "-E --show-overlap 顯示未合併的更改部份，並括上互相抵觸的地方。" +msgstr "" #: src/diff3.c:436 #, fuzzy -msgid "-i append `w' and `q' commands to ed scripts" +msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i 在 ed script 中附加‘w’和‘q’指令。" #: src/diff3.c:438 @@ -1153,9 +1167,8 @@ msgid "" msgstr "" #: src/diff3.c:448 -#, fuzzy msgid " --help display this help and exit" -msgstr "-a --text 所有檔案都以文字檔方式處理。" +msgstr "" #: src/diff3.c:449 #, fuzzy @@ -1206,30 +1219,30 @@ msgstr "內部錯誤：process_diff 中的 diff 類型無效" msgid "invalid diff format; invalid change separator" msgstr "無效的 diff 格式；表示資料變更的分隔字串無效" -#: src/diff3.c:1272 +#: src/diff3.c:1251 msgid "invalid diff format; incomplete last line" msgstr "無效的 diff 格式；最後一行不完整" -#: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 -#, c-format -msgid "subsidiary program `%s' could not be invoked" +#: src/diff3.c:1275 src/sdiff.c:275 src/util.c:392 +#, fuzzy, c-format +msgid "subsidiary program '%s' could not be invoked" msgstr "子程式 ‘%s’ 無法執行" -#: src/diff3.c:1321 +#: src/diff3.c:1300 msgid "invalid diff format; incorrect leading line chars" msgstr "diff 格式無效；某行的第一個字元不正確" -#: src/diff3.c:1394 +#: src/diff3.c:1373 msgid "internal error: invalid diff type passed to output" msgstr "內部錯誤：準備輸出的 diff 資料類型無效" -#: src/diff3.c:1668 src/diff3.c:1725 +#: src/diff3.c:1647 src/diff3.c:1704 msgid "input file shrank" msgstr "輸入檔縮小" #: src/dir.c:158 -#, c-format -msgid "cannot compare file names `%s' and `%s'" +#, fuzzy, c-format +msgid "cannot compare file names '%s' and '%s'" msgstr "無法比較檔案 ‘%s’ 和 ‘%s’" #: src/dir.c:209 @@ -1242,127 +1255,132 @@ msgstr "" msgid "Thomas Lord" msgstr "" -#: src/sdiff.c:170 +#: src/sdiff.c:173 #, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "-o 檔案 --output=檔案 互動式操作，並將結果寫入至<檔案>。" -#: src/sdiff.c:172 +#: src/sdiff.c:175 #, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i --ignore-case 不分辨檔案內容中的大小寫。" -#: src/sdiff.c:173 +#: src/sdiff.c:176 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion 忽略因將 tab 轉換為空格而造成的差異。" -#: src/sdiff.c:174 +#: src/sdiff.c:177 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space 忽略所有空白字元。" -#: src/sdiff.c:175 +#: src/sdiff.c:178 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change 忽略因空白字元數目不同而造成的差異。" -#: src/sdiff.c:176 +#: src/sdiff.c:179 #, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space 忽略所有空白字元。" +msgstr "-W --ignore-all-space 忽略所有空白字元。" -#: src/sdiff.c:177 +#: src/sdiff.c:180 #, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差異。" -#: src/sdiff.c:179 +#: src/sdiff.c:181 +#, fuzzy +msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" +msgstr "" +"-I RE --ignore-matching-lines=RE 忽略任何符合指定的<正規表示式>的地方。" + +#: src/sdiff.c:182 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。" -#: src/sdiff.c:180 +#: src/sdiff.c:183 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有檔案都以文字檔方式處理。" -#: src/sdiff.c:182 +#: src/sdiff.c:185 #, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" -#: src/sdiff.c:183 +#: src/sdiff.c:186 #, fuzzy msgid "" "-l, --left-column output only the left column of common lines" msgstr "-l --left-column 當有兩行相同時只顯示左邊的一行。" -#: src/sdiff.c:184 +#: src/sdiff.c:187 #, fuzzy msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines 當有兩行相同時不會顯示。" -#: src/sdiff.c:186 +#: src/sdiff.c:189 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs 將輸出中的 tab 換成空格。" -#: src/sdiff.c:187 +#: src/sdiff.c:190 #, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "--tabsize=NUM 定位字元 (tab) 的寬度，預設為 8 個空格。" -#: src/sdiff.c:189 +#: src/sdiff.c:192 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal 盡可能找出最小的差異。" -#: src/sdiff.c:190 +#: src/sdiff.c:193 #, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "-H --speed-large-files 假設檔案十分大而且當中含有許多些微的差異。" -#: src/sdiff.c:191 +#: src/sdiff.c:194 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=程式 使用<程式>來比較檔案。" -#: src/sdiff.c:193 -#, fuzzy +#: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "-a --text 所有檔案都以文字檔方式處理。" +msgstr "" -#: src/sdiff.c:194 +#: src/sdiff.c:197 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 顯示版本資訊。" -#: src/sdiff.c:203 +#: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "用法：%s [選項]... 檔案1 檔案2\n" -#: src/sdiff.c:205 +#: src/sdiff.c:208 #, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "以並排方式合併檔案之間的差異。" -#: src/sdiff.c:326 +#: src/sdiff.c:329 msgid "cannot interactively merge standard input" msgstr "不允許以互動方式合併標準輸入的資料" -#: src/sdiff.c:592 +#: src/sdiff.c:595 msgid "both files to be compared are directories" msgstr "兩個要比較的都是目錄" -#: src/sdiff.c:827 +#: src/sdiff.c:818 #, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" @@ -1387,56 +1405,43 @@ msgstr "" "v ：\t加上兩邊一樣的行組時會在畫面顯示。\n" "q ：\t離開。\n" +#~ msgid "%s: illegal option -- %c\n" +#~ msgstr "%s：不合法的選項 ─ %c\n" + +#~ msgid "" +#~ "This is free software; see the source for copying conditions. There is " +#~ "NO\n" +#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " +#~ "PURPOSE.\n" +#~ msgstr "" +#~ "本程式是自由軟體；請參考源代碼中的版權聲明。本軟體不提供任何保證，甚至不" +#~ "會\n" +#~ "包括可售性或適用於任何特定目的的保證。\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "-s --quiet --silent 不輸出任何資訊；只產生回傳值。" -#, fuzzy -#~ msgid "-v --version Output version info." -#~ msgstr "-v --version 顯示版本資訊。" - #~ msgid "--help Output this help." #~ msgstr "--help 顯示此求助說明。" -#, fuzzy -#~ msgid "Compare files line by line." -#~ msgstr "比較三個檔案的每一行。" - -#, fuzzy -#~ msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." -#~ msgstr "-E --ignore-tab-expansion 忽略因將 tab 轉換為空格而造成的差異。" - -#, fuzzy -#~ msgid "" -#~ "-b --ignore-space-change Ignore changes in the amount of white space." -#~ msgstr "-b --ignore-space-change 忽略因空白字元數目不同而造成的差異。" - -#, fuzzy -#~ msgid "-w --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space 忽略所有空白字元。" - -#, fuzzy -#~ msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." -#~ msgstr "-B --ignore-blank-lines 忽略任何因空行而造成的差異。" +#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." +#~ msgstr "請向 <bug-gnu-utils@gnu.org> 回報錯誤。" -#, fuzzy -#~ msgid "--strip-trailing-cr Strip trailing carriage return on input." -#~ msgstr "" -#~ "--strip-trailing-cr 去除輸入資料每行末端的 carriage return 字元。" +#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" +#~ msgstr "‘-%ld’ 選項已過時；請使用 ‘-%c %ld’" -#, fuzzy -#~ msgid "-a --text Treat all files as text." -#~ msgstr "-a --text 所有檔案都以文字檔方式處理。" +#~ msgid "`-%ld' option is obsolete; omit it" +#~ msgstr "‘-%ld’ 選項已過時；會忽略此選項" -#, fuzzy #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " #~ "context.\n" #~ "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " #~ "context.\n" -#~ " -L LABEL --label=LABEL Use LABEL instead of file name.\n" +#~ " --label LABEL Use LABEL instead of file name.\n" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" @@ -1448,10 +1453,6 @@ msgstr "" #~ " -p --show-c-function 顯示和每個差異有關的 C 函式名稱。\n" #~ " -F RE --show-function-line=RE 顯示最接近而符合<正規表示式>的一行。" -#, fuzzy -#~ msgid "-e --ed Output an ed script." -#~ msgstr "-e --ed 以 ed script 方式輸出。" - #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" #~ " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" @@ -1463,30 +1464,10 @@ msgstr "" #~ " --left-column 當有兩行相同時只顯示左邊的一行。\n" #~ " --suppress-common-lines 當有兩行相同時不會顯示。" -#, fuzzy -#~ msgid "-t --expand-tabs Expand tabs to spaces in output." -#~ msgstr "-t --expand-tabs 將輸出中的 tab 換成空格。" - -#, fuzzy -#~ msgid "-T --initial-tab Make tabs line up by prepending a tab." -#~ msgstr "-T --initial-tab 每行先加上 tab 字元，使 tab 字元可以對齊。" - -#, fuzzy -#~ msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." -#~ msgstr "--tabsize=NUM 定位字元 (tab) 的寬度，預設為 8 個空格。" - -#, fuzzy -#~ msgid "-d --minimal Try hard to find a smaller set of changes." -#~ msgstr "-d --minimal 盡可能找出最小的差異。" - #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "--speed-large-files 假設檔案十分大而且當中含有許多些微的差異。" -#, fuzzy -#~ msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." -#~ msgstr "-A --show-all 顯示所有要更改的部份，並括上互相抵觸的地方。" - #~ msgid "-X Output overlapping changes, bracketing them." #~ msgstr "-X 顯示重疊的更改部份，並括上記號。" @@ -1497,74 +1478,6 @@ msgstr "" #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." #~ msgstr "-L 標籤 --label=標籤 以<標籤>代替檔案名稱。" -#, fuzzy -#~ msgid "--diff-program=PROGRAM Use PROGRAM to compare files." -#~ msgstr "--diff-program=程式 使用<程式>來比較檔案。" - -#, fuzzy -#~ msgid "-W --ignore-all-space Ignore all white space." -#~ msgstr "-W --ignore-all-space 忽略所有空白字元。" - -#, fuzzy -#~ msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." -#~ msgstr "-w NUM --width=NUM 每行顯示最多 NUM（預設 130）個字元。" - -#, fuzzy -#~ msgid "-l --left-column Output only the left column of common lines." -#~ msgstr "-l --left-column 當有兩行相同時只顯示左邊的一行。" - -#, fuzzy -#~ msgid "" -#~ "-H --speed-large-files Assume large files and many scattered small " -#~ "changes." -#~ msgstr "--speed-large-files 假設檔案十分大而且當中含有許多些微的差異。" - -#, fuzzy -#~ msgid "fclose failed" -#~ msgstr "讀取資料失敗" - -#, fuzzy -#~ msgid "pipe failed" -#~ msgstr "寫入失敗" - -#, fuzzy -#~ msgid "fork failed" -#~ msgstr "讀取資料失敗" - -#, fuzzy -#~ msgid "fdopen failed" -#~ msgstr "讀取資料失敗" - -#, fuzzy -#~ msgid "waitpid failed" -#~ msgstr "寫入失敗" - -#, fuzzy -#~ msgid "mkstemp failed" -#~ msgstr "寫入失敗" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s：不合法的選項 ─ %c\n" - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "本程式是自由軟體；請參考源代碼中的版權聲明。本軟體不提供任何保證，甚至不" -#~ "會\n" -#~ "包括可售性或適用於任何特定目的的保證。\n" - -#~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "請向 <bug-gnu-utils@gnu.org> 回報錯誤。" - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "‘-%ld’ 選項已過時；請使用 ‘-%c %ld’" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "‘-%ld’ 選項已過時；會忽略此選項" - #~ msgid "subsidiary program `%s' not found" #~ msgstr "找不到子程式 ‘%s’" |