summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <bero@arklinux.org>2002-03-13 13:45:55 +0000
committerBernhard Rosenkraenzer <bero@arklinux.org>2002-03-13 13:45:55 +0000
commit5c98abb55aeab9e78a505609092b10830a33128a (patch)
treef5451576a4a6d2023b2c683ee0a998055f059321
parentf599d897efdadc3ce5ee56ca2272ab931efae881 (diff)
downloadgrep-5c98abb55aeab9e78a505609092b10830a33128a.tar.gz
Update translations
* po/*: Sync with translation project
-rw-r--r--ChangeLog1
-rw-r--r--NEWS2
-rw-r--r--po/bg.po403
-rw-r--r--po/ca.po410
-rw-r--r--po/cs.po158
-rw-r--r--po/da.po324
-rw-r--r--po/de.po239
-rw-r--r--po/el.po161
-rw-r--r--po/eo.po121
-rw-r--r--po/es.po119
-rw-r--r--po/et.po103
-rw-r--r--po/fr.po194
-rw-r--r--po/gl.po132
-rw-r--r--po/hr.po411
-rw-r--r--po/id.po395
-rw-r--r--po/it.po137
-rw-r--r--po/ja.po201
-rw-r--r--po/ko.po460
-rw-r--r--po/nb.po353
-rw-r--r--po/nl.po395
-rw-r--r--po/pl.po131
-rw-r--r--po/pt_BR.po305
-rw-r--r--po/ru.po118
-rw-r--r--po/sl.po127
-rw-r--r--po/sv.po107
-rw-r--r--po/tr.po396
26 files changed, 3750 insertions, 2153 deletions
diff --git a/ChangeLog b/ChangeLog
index e8c56f8e..db26307a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* configure.in, m4/regex.m4, m4/malloc.m4, m4/realloc.m4:
Don't set LIBOBJS directly, autoconf 2.53 doesn't like it
* intl/*: Sync with gettext 0.11
+ * po/*: Sync with translation project
2002-01-23 Bernhard Rosenkraenzer <bero@redhat.com>
* configure.in: Version 2.5g
diff --git a/NEWS b/NEWS
index e9bdd595..d02b3503 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,8 @@ Version 2.5
matching lines.
New option -m; equivalent to --max-count.
+ - Translations for bg, ca, da, nb and tr have been added.
+
Version 2.4.2
- Added more check in configure to default the grep-${version}/src/regex.c
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 00000000..4fc05e06
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,403 @@
+# GNU grep messages translated in Bulgarian language.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Pavel Mihaylov <avatarbg@bulgaria.com>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-09 02:00+0200\n"
+"Last-Translator: Pavel Mihaylov <avatarbg@bulgaria.com>\n"
+"Language-Team: Bulgarian <bg@bulgaria.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+msgid "Memory exhausted"
+msgstr "Паметта е изчерпана"
+
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
+msgid "Unbalanced ["
+msgstr "Небалансирана ["
+
+#: src/dfa.c:741
+msgid "Unfinished \\ escape"
+msgstr "Незавършена \\ последователност"
+
+#. Cases:
+#. {M} - exact count
+#. {M,} - minimum count, maximum is infinity
+#. {M,N} - M through N
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+msgid "unfinished repeat count"
+msgstr "незавършен брой повторения"
+
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+msgid "malformed repeat count"
+msgstr "грешно зададен брой повторения"
+
+#: src/dfa.c:1253
+msgid "Unbalanced ("
+msgstr "Небалансирана ("
+
+#: src/dfa.c:1378
+msgid "No syntax specified"
+msgstr "Не е зададен синтаксис"
+
+#: src/dfa.c:1386
+msgid "Unbalanced )"
+msgstr "Небалансирана )"
+
+#: src/dfa.c:2956
+msgid "out of memory"
+msgstr "недостатъчна памет"
+
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
+msgid "memory exhausted"
+msgstr "паметта е изчерпана"
+
+#: src/grep.c:205
+msgid "invalid context length argument"
+msgstr "невалиден размер на контекста"
+
+#: src/grep.c:475
+msgid "input is too large to count"
+msgstr "входните данни са прекалено големи за да бъдат преброени"
+
+#: src/grep.c:597
+msgid "writing output"
+msgstr "записване на изходните данни"
+
+#: src/grep.c:870
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr "Двоичен файл %s съвпада\n"
+
+#: src/grep.c:884
+msgid "(standard input)"
+msgstr "(стандартен вход)"
+
+#: src/grep.c:989
+#, c-format
+msgid "warning: %s: %s\n"
+msgstr "предупреждение: %s: %s\n"
+
+#: src/grep.c:990
+msgid "recursive directory loop"
+msgstr "рекурсивна обработка на директориите"
+
+#: src/grep.c:1038
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "Употреба: %s [ОПЦИЯ]... ТЕКСТ [ФАЙЛ]...\n"
+
+#: src/grep.c:1040
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Вижте `%s --help' за повече информация.\n"
+
+#: src/grep.c:1045
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+msgstr "Употреба: %s [ОПЦИЯ]... ТЕКСТ [ФАЙЛ]...\n"
+
+#: src/grep.c:1046
+#, c-format
+msgid ""
+"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Regexp selection and interpretation:\n"
+msgstr ""
+"Търси ТЕКСТ във всеки ФАЙЛ или в стандартия вход.\n"
+"Пример: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Избор на типа регулярен израз и интерпретация:\n"
+
+#: src/grep.c:1051
+msgid ""
+" -E, --extended-regexp PATTERN is an extended regular expression\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression\n"
+" -P, --perl-regexp PATTERN is a Perl regular expression\n"
+msgstr ""
+" -E, --extended-regexp ТЕКСТ е разширен регулярен израз\n"
+" -F, --fixed-regexp ТЕКСТ е фиксиран низ, отделен с нови редове\n"
+" -G, --basic-regexp ТЕКСТ е прост регулярен израз\n"
+" -P, --perl-regexp ТЕКСТ е Perl регулярен израз\n"
+
+#: src/grep.c:1056
+msgid ""
+" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -f, --file=FILE obtain PATTERN from FILE\n"
+" -i, --ignore-case ignore case distinctions\n"
+" -w, --word-regexp force PATTERN to match only whole words\n"
+" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
+msgstr ""
+" -e, --regexp=ТЕКСТ използва ТЕКСТ като регулярен израз\n"
+" -f, --file=ФАЙЛ получава ТЕКСТ от ФАЙЛ\n"
+" -i, --ignore-case игнорира различието в малки и главни букви\n"
+" -w, --word-regexp ТЕКСТ ще съвпада само с цели думи\n"
+" -x, --line-regexp ТЕКСТ ще съвпада само с цели редове\n"
+" -z, --null-data редовете във ФАЙЛ завършват с 0 (NULL),\n"
+" а не със символ за нов ред (LF)\n"
+
+#: src/grep.c:1063
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --invert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
+msgstr ""
+"\n"
+"Разни:\n"
+" -s, --no-messages не извежда съобщения за грешки\n"
+" -v, --revert-match избира несъвпадащи редове\n"
+" -V, --version извежда информация за версията и излиза\n"
+" --help показва помощна информация и излиза\n"
+" --mmap използва memory-mapped вход ако е възможно\n"
+
+#: src/grep.c:1071
+msgid ""
+"\n"
+"Output control:\n"
+" -m, --max-count=NUM stop after NUM matches\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" --line-buffered flush output on every line\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
+" -d, --directories=ACTION how to handle directories\n"
+" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
+" -R, -r, --recursive equivalent to --directories=recurse\n"
+" --include=PATTERN files that match PATTERN will be examined\n"
+" --exclude=PATTERN files that match PATTERN will be skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
+" -L, --files-without-match only print FILE names containing no match\n"
+" -l, --files-with-matches only print FILE names containing matches\n"
+" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
+msgstr ""
+"\n"
+"Опции контролиращи форматирането на резултата:\n"
+" -m, --max-count=БРОЙ спира след БРОЙ резултата\n"
+" -b, --byte-offset извежда отместването в байтове за всеки ред\n"
+" -n, --line-number извежда номера на реда за всеки ред\n"
+" --line-buffered извежда резултата по цял ред наведнъж\n"
+" -H, --with-filename извежда името на файла за всяко съвпадение\n"
+" -h, --no-filename не извежда името на файла за всяко съвпадение\n"
+" --label=ЕТИКЕТ извежда ЕТИКЕТ като име на файл за стандартния вход\n"
+" -o, --only-matching извежда само частта от реда, която съвпада с ТЕКСТ\n"
+" -q, --quiet, --silent не извежда никакъв резултат при нормална работа\n"
+" --binary-files=ТИП задава типа на двоичните файлове\n"
+" ТИП може да 'binary' (двоичен), 'text' (текстов),\n"
+" или 'without-match' (без съвпадение).\n"
+" -a, --text също като --binary-files=text\n"
+" -I също като --binary-files=without-match\n"
+" -d, --directories=МЕТОД задава метод на действие при директориите\n"
+" МЕТОД може да е \"read\" (прочети), \"recurse\"\n"
+" (претърси рекурсивно), или \"skip\" (пропусни).\n"
+" -D, --devices=МЕТОД как да се обработват специалните файлове,\n"
+" FIFO и сокети. МЕТОД може да е \"read\" (чети)\n"
+" или \"skip\" (пропусни)\n"
+" -R, -r, --recursive също като --directories=recurse.\n"
+" --include=ТЕКСТ файлове съвпадащи с ТЕКСТ ще бъдат\n"
+" използвани за съвпадане\n"
+" --exclude=ТЕКСТ файлове съвпадащи с ТЕКСТ ще бъдат пропуснати.\n"
+" --exclude-from=ФАЙЛ файлове съвпадащи с ТЕКСТ във ФАЙЛ\n"
+" ще бъдат пропуснати.\n"
+" -L, --files-without-match извежда само имена на файлове,\n"
+" в които няма съвпадение\n"
+" -l, --files-with-matches извежда само имена на файлове,\n"
+" в които има съвпадение\n"
+" -c, --count извежда само броя на съвпадащите редове\n"
+" за всеки файл\n"
+" -Z, --null извежда символ NULL след всяко име на файл\n"
+
+#: src/grep.c:1099
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context=NUM print NUM lines of output context\n"
+" -NUM same as --context=NUM\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
+" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
+" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
+"\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
+msgstr ""
+"\n"
+"Контрол върху контекста:\n"
+" -B, --before-context=N извежда N реда от предхождащия контекст\n"
+" -A, --after-context=N извежда N реда от следващия контекст\n"
+" -C, --context=N извежда N реда от изходния контекст\n"
+" -ЧИСЛО също като --context=N\n"
+" --color, --colour използва маркери за различаване на съвпадащите низове\n"
+" -U, --binary не филтрира CR символи в края на реда (MSDOS)\n"
+" -u, --unix-byte-offsets съобщава отместванията все едно, че символите CR\n"
+" липсват (MSDOS)\n"
+"\n"
+"`egrep' означава `grep -E'. `fgrep' означава `grep -F'.\n"
+"Без да е зададен ФАЙЛ, или когато ФАЙЛ е - се чете стандартния вход.\n"
+"Ако са зададени по-малко от два ФАЙЛа се предполага -h.\n"
+"При изход grep връща 0 ако има съвпадение, 1 ако няма и 2 при грешка.\n"
+
+#: src/grep.c:1116
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+"За програмни грешки съобщавайте на <bug-gnu-utils@gnu.org>.\n"
+
+#: src/grep.c:1126
+msgid "conflicting matchers specified"
+msgstr "зададените изрази за съвпадение са в конфликт"
+
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "неизвестен метод за обработка на специалните файлове"
+
+#: src/grep.c:1430
+msgid "unknown directories method"
+msgstr "неизвестен метод за обработка на директориите"
+
+#: src/grep.c:1497
+msgid "invalid max count"
+msgstr "невалиден максимален брой"
+
+#: src/grep.c:1551
+msgid "unknown binary-files type"
+msgstr "непознат тип двоичен файл"
+
+#: src/grep.c:1646
+#, c-format
+msgid "%s (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
+
+#: src/grep.c:1648
+msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:1650
+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"
+
+#: src/search.c:606
+msgid "The -P option is not supported"
+msgstr "Опция -P не се поддържа"
+
+#: src/search.c:619
+msgid "The -P and -z options cannot be combined"
+msgstr "Опциите -P и -z не могат да бъдат комбинирани"
+
+#: lib/error.c:117
+msgid "Unknown system error"
+msgstr "Неизвестна системна грешка"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: опция `%s' не е еднозначна\n"
+
+#: lib/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: опция `--%s' се използва без аргумент\n"
+
+#: lib/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: опция `%c%s' се използва без аргумент\n"
+
+#: lib/getopt.c:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: опция `%s' изисква аргумент\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: непозната опция `--%s'\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: непозната опция `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: грешна опция -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: невалидна опция -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:815 lib/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: опция изискваща аргумент -- %c\n"
+
+#: lib/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: опция `-W %s' не е еднозначна\n"
+
+#: lib/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: опция `-W %s' се използва без аргумент\n"
+
+#. 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, 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.
+#: lib/quotearg.c:259
+msgid "`"
+msgstr "\""
+
+#: lib/quotearg.c:260
+msgid "'"
+msgstr "\""
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 00000000..54840586
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,410 @@
+# Traducci missatges de GNU grep al catal.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Enric Alberola Rosell <enricalberola@wanadoo.es>, 2002.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-11 15:46+0100\n"
+"Last-Translator: Enric Alberola Rosell <enricalberola@wanadoo.es>\n"
+"Language-Team: Catalan <ca@dodds.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+msgid "Memory exhausted"
+msgstr "Memria exhaurida"
+
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
+msgid "Unbalanced ["
+msgstr "[ desaparellat"
+
+#: src/dfa.c:741
+msgid "Unfinished \\ escape"
+msgstr "Codi d'escapada \\ inacabat"
+
+#. Cases:
+#. {M} - exact count
+#. {M,} - minimum count, maximum is infinity
+#. {M,N} - M through N
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+msgid "unfinished repeat count"
+msgstr "comptador de repetici inacabat"
+
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+msgid "malformed repeat count"
+msgstr "comptador de repetici defectus"
+
+#: src/dfa.c:1253
+msgid "Unbalanced ("
+msgstr "( desaparellat"
+
+#: src/dfa.c:1378
+msgid "No syntax specified"
+msgstr "No s'ha especificat cap sintaxi"
+
+#: src/dfa.c:1386
+msgid "Unbalanced )"
+msgstr ") desaparellat"
+
+#: src/dfa.c:2956
+msgid "out of memory"
+msgstr "sense memria"
+
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
+msgid "memory exhausted"
+msgstr "memria exhaurida"
+
+#: src/grep.c:205
+msgid "invalid context length argument"
+msgstr "longitud del context invlida"
+
+#: src/grep.c:475
+msgid "input is too large to count"
+msgstr "l'entrada s massa llarga per a comptar"
+
+#: src/grep.c:597
+msgid "writing output"
+msgstr "escrivint eixida"
+
+#: src/grep.c:870
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr "Concidncia en el fitxer binari %s\n"
+
+#: src/grep.c:884
+msgid "(standard input)"
+msgstr "(entrada estndard)"
+
+#: src/grep.c:989
+#, c-format
+msgid "warning: %s: %s\n"
+msgstr "avs: %s: %s\n"
+
+#: src/grep.c:990
+msgid "recursive directory loop"
+msgstr "bucle de directori recursiu"
+
+#: src/grep.c:1038
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "s: %s [OPCI]... PATR [FITXER] ...\n"
+
+#: src/grep.c:1040
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Proveu amb \"%s --help\" per a obtenir ms informaci.\n"
+
+#: src/grep.c:1045
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+msgstr "s: %s [OPCI]... PATR [FITXER] ...\n"
+
+#: src/grep.c:1046
+#, c-format
+msgid ""
+"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Regexp selection and interpretation:\n"
+msgstr ""
+"Cerca PATR en cada FITXER o en l'entrada estndard.\n"
+"Exemple: %s -i \"hola mn\" menu.h main.c\n"
+"\n"
+"Selecci i interpretaci de l'expressi regular:\n"
+
+#: src/grep.c:1051
+msgid ""
+" -E, --extended-regexp PATTERN is an extended regular expression\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression\n"
+" -P, --perl-regexp PATTERN is a Perl regular expression\n"
+msgstr ""
+" -E, --extended-regexp PATR s una expressi regular extesa\n"
+" -F, --fixed-strings PATR s un conjunt de cadenes separades per \n"
+" carcters de nova lnia\n"
+" -G, --basic-regexp PATR s un expressi regular bsica\n"
+" -P, --perl-regexp PATR s un expressi regular de Perl\n"
+
+#: src/grep.c:1056
+msgid ""
+" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -f, --file=FILE obtain PATTERN from FILE\n"
+" -i, --ignore-case ignore case distinctions\n"
+" -w, --word-regexp force PATTERN to match only whole words\n"
+" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
+msgstr ""
+" -e, --regexp=PATR utilitza el PATR com a expressi regular\n"
+" -f, --file=FITXER obt el PATR del FITXER\n"
+" -i, --ignore-case no t en compte majscules i minscules\n"
+" -w, --word-regexp fora la concordana del PATR amb paraules\n"
+" completes\n"
+" -x, --line-regexp fora la concordana del PATR amb lnies\n"
+" completes\n"
+" -z, --null-data considera que una lnia de dades acaba amb el\n"
+" byte 0 i no amb el carcter de nova lnia\n"
+
+#: src/grep.c:1063
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --invert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
+msgstr ""
+"\n"
+"Miscellanis:\n"
+" -s, --no-messages suprimeix els missatges d'error\n"
+" -v, --invert-match selecciona les lnies que no coincideixen\n"
+" -V, --version mostra la informaci sobre la versi i acaba\n"
+" --help mostra aquesta ajuda i acaba\n"
+" --mmap si s possible utilitza com a entrada la\n"
+" memria assignada\n"
+
+#: src/grep.c:1071
+msgid ""
+"\n"
+"Output control:\n"
+" -m, --max-count=NUM stop after NUM matches\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" --line-buffered flush output on every line\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
+" -d, --directories=ACTION how to handle directories\n"
+" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
+" -R, -r, --recursive equivalent to --directories=recurse\n"
+" --include=PATTERN files that match PATTERN will be examined\n"
+" --exclude=PATTERN files that match PATTERN will be skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
+" -L, --files-without-match only print FILE names containing no match\n"
+" -l, --files-with-matches only print FILE names containing matches\n"
+" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
+msgstr ""
+"\n"
+"Control d'eixida:\n"
+" -m, --max-count=NOMBRE s'atura desprs de NOMBRE coincidncies\n"
+" -b, --byte-offset mostra el desplaament en bytes en les lnies\n"
+" d'eixida\n"
+" -n, --line-number mostra el nmero de lnia en les lnies\n"
+" d'eixida\n"
+" --line-buffered descarrega el resultat per a cada lnia\n"
+" -H, --with-filename mostra el nom del fitxer per a cada coincidncia\n"
+" -h, --no-filename elimina els noms de fitxer en l'eixida\n"
+" --label=ETIQUETA mostra ETIQUETA com a nom de fitxer per\n"
+" a l'entrada estndard\n"
+" -o, --only-matching mostra noms la part de la lnia que coincideix\n"
+" amb PATR\n"
+" -q, --quiet, --silent elimina tota l'eixida normal\n"
+" --binary-files=TIPUS indica el TIPUS dels fitxers binaris, que pot \n"
+" ser \"binary\", \"text\" o \"without-match\"\n"
+" -a, --text equival a --binary-files=text\n"
+" -I equival a --binary-files=without-match\n"
+" -d, --directories=ACCI indica com tractar els directoris. ACCI pot\n"
+" ser \"read\", \"recurse\" o \"skip\"\n"
+" -D, --devices=ACCI indica com manegar els dispositius, els FIFO i\n"
+" els sockets. ACCI pot ser \"read\" o \"skip\"\n"
+" -R, -r, --recursive equival a --directories=recurse\n"
+" --include=PATR examina els fitxers que contenen PATR\n"
+" --exclude=PATR exclou els fitxers que contenen PATR\n"
+" --exclude-from=FITXER exclou els fitxers que tenen coincidncies amb\n"
+" els patrons del FITXER\n"
+" -L, --files-without-match noms mostra els fitxers que no tenen\n"
+" coincidncies\n"
+" -l, --files-with-matches noms mostra els fitxers que tenen coincidncies\n"
+" -c, --count noms compta les lnies que coincideixen\n"
+" per fitxer\n"
+" -Z, --null imprimeix un byte 0 desprs del nom del fitxer\n"
+
+#: src/grep.c:1099
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context=NUM print NUM lines of output context\n"
+" -NUM same as --context=NUM\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
+" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
+" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
+"\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
+msgstr ""
+"\n"
+"Control del context:\n"
+" -B, --before-context=NOMBRE mostra NOMBRE lnies del context anterior\n"
+" -A, --after-context=NOMBRE mostra NOMBRE lnies del context posterior\n"
+" -C, --context=NOMBRE mostra NOMBRE lnies del context\n"
+" -NUM el mateix que --context=NUM\n"
+" --color[=QUAN],\n"
+" --colour[=QUAN] ressalta amb marcadors la cadena que\n"
+" coincideix. QUAN pot ser: \"always\",\n"
+" \"never\" o \"auto\".\n"
+" -U, --binary no elimina els carcteres de retorn de carro\n"
+" finals de lnia (MSDOS)\n"
+" -u, --unix-byte-offsets compta els desplaaments como si no hi hagus\n"
+" retorns de carro (MSDOS)\n"
+"\n"
+"\"egrep\" significa \"grep -E\". \"fgrep\" significa \"grep -F\".\n"
+"Si no s'especifica cap FITXER, o quan s -, llegeix l'entrada estndard.\n"
+"Si sn menys de dos fitxers, assumeix -h. El resultat en acabar s 0 si\n"
+"s'han trobat coincidncies, 1 si no hi han i 2 en cas d'haver tingut algun\n"
+"problema.\n"
+
+#: src/grep.c:1116
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+"Podeu notificar els errors del programa a <bug-gnu-utils@gnu.org>.\n"
+
+#: src/grep.c:1126
+msgid "conflicting matchers specified"
+msgstr "s'han especificat expressions conflictives"
+
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "mtode de dispositius desconegut"
+
+#: src/grep.c:1430
+msgid "unknown directories method"
+msgstr "mtode de directoris desconegut"
+
+#: src/grep.c:1497
+msgid "invalid max count"
+msgstr "comptador mxim invlid"
+
+#: src/grep.c:1551
+msgid "unknown binary-files type"
+msgstr "tipus de fitxer binari desconegut"
+
+#: src/grep.c:1646
+#, c-format
+msgid "%s (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
+
+#: src/grep.c:1648
+msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:1650
+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 a conixer les condicions\n"
+"de cpia. No hi ha CAP garantia; ni tan sols sobre la COMERCIABILITAT o\n"
+"l'ADEQUACI PER A UN PROPSIT CONCRET.\n"
+
+#: src/search.c:606
+msgid "The -P option is not supported"
+msgstr "L'opci -P no est suportada"
+
+#: src/search.c:619
+msgid "The -P and -z options cannot be combined"
+msgstr "No es poden combinar les opcions -P i -z"
+
+#: lib/error.c:117
+msgid "Unknown system error"
+msgstr "Error desconegut del sistema"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'opci \"%s\" s ambigua\n"
+
+#: lib/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: l'opci \"--%s\" no permet un argument\n"
+
+#: lib/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: l'opci \"%c%s\" no permet un argument\n"
+
+#: lib/getopt.c:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'opci \"%s\" necessita un argument\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opci desconeguda \"--%s\"\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opci desconeguda \"%c%s\"\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opci illegal -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opci invlida -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:815 lib/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'opci necessita un argument -- %c\n"
+
+#: lib/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'opci \"-W %s\" s ambigua\n"
+
+#: lib/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: l'opci \"-W %s\" no permet un argument\n"
+
+#. 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, 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.
+#: lib/quotearg.c:259
+msgid "`"
+msgstr "\""
+
+#: lib/quotearg.c:260
+msgid "'"
+msgstr "\""
diff --git a/po/cs.po b/po/cs.po
index aa650a75..473efc29 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,30 +3,31 @@
# Vladimir Michl <Vladimir.Michl@seznam.cz>, 1998.
#
# Thanks to: Stanislav Brabec <utx@k332.feld.cvut.cz>
+# Note: 2 messages untranslated, it's OK.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.4f\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2000-02-21 08:05+01:00\n"
+"Project-Id-Version: grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2001-08-04 12:01+02:00\n"
"Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Pame vyerpna"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
+#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
+#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
+#: src/dfa.c:1045 src/dfa.c:1046
msgid "Unbalanced ["
msgstr "Lich poet ["
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Za \\ chyb znak"
@@ -34,33 +35,33 @@ msgstr "Za \\ chyb znak"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "neukonen zpis potu opakovn"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "deformovan zpis potu opakovn"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Lich poet ("
# ? Nen zadan syntaxe
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Syntaxe nen urena"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Lich poet )"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "nedostatek voln pamti"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
+#: src/search.c:103 src/search.c:223 src/search.c:307
msgid "memory exhausted"
msgstr "pam vyerpna"
@@ -68,48 +69,48 @@ msgstr "pam vyerpna"
msgid "invalid context length argument"
msgstr "neplatn argument dlky kontextu"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "poet vstupnch dk nelze spotat (je jich hodn)"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "zapisuje se vstup"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binrn soubor %s odpovd\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(standardn vstup)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: varovn: %s: %s\n"
+msgstr "varovn: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "smyka pro rekurzivn prchod"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Pouit: %s [PEPNA]... VZOREK [SOUBOR]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Vce informac zskte pkazem `%s --help'.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Pouit: %s [PEPNA]... VZOREK [SOUBOR]...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -117,15 +118,13 @@ msgid ""
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
-" Hled dky, jejich nkter sti vyhovuj VZORKu. dky jsou teny "
-"postupn\n"
+" Hled dky, jejich nkter sti vyhovuj VZORKu. dky jsou teny postupn\n"
"ze vech zadanch SOUBOR nebo ze standardnho vstupu.\n"
"Pklad: %s -i 'hello world' menu.h main.c\n"
"\n"
"Vbr a interpretace regulrnho vrazu:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,11 +132,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp VZOREK je rozen regulrn vraz\n"
-" -F, --fixed-strings VZOREK je mnoina etzc, kad na jednom "
-"dku\n"
+" -F, --fixed-strings VZOREK je mnoina etzc, kad na jednom dku\n"
" -G, --basic-regexp VZOREK je zkladn regulrn vraz\n"
+" -P, --perl-regexp VZOREK je regulrn vraz Perlu\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -151,10 +150,9 @@ msgstr ""
" -i, --ignore-case ignoruje rozdl mezi velikost psmen\n"
" -w, --word-regexp VZOREK bude aplikovn pouze na cel slova\n"
" -x, --line-regexp VZOREK bude aplikovn pouze na cel dky\n"
-" -z, --null-data dek kon nulovm bajtem msto znaku novho "
-"dku\n"
+" -z, --null-data dek kon nulovm bajtem msto znaku novho dku\n"
-#: src/grep.c:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -172,8 +170,7 @@ msgstr ""
" --help vype tuto npovdu a skon\n"
" --mmap kdy to jde, namapuje vstup do pamti\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -191,10 +188,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --include=PATTERN files that match PATTERN will be examine\n"
+" --exclude=PATTERN files that match PATTERN will be skip.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skip.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -202,31 +198,33 @@ msgid ""
msgstr ""
"\n"
"zen vstupu:\n"
+" -m, --max-count=SLO skon, pokud najde SLO vraz\n"
" -b, --byte-offset s kadm vstupnm dkem vype jeho pozici\n"
" v souboru\n"
-" -n, --line-number s kadm vstupnm dkem vype jeho slo "
-"dku\n"
+" -n, --line-number s kadm vstupnm dkem vype jeho slo dku\n"
+" --line-buffered vyprzdn vstup po kadm dku\n"
" -H, --with-filename s kadm vstupnm dkem vype jmno souboru\n"
" -h, --no-filename potla vypisovn jmna souboru s vst. dkem\n"
" -q, --quiet, --silent potla obvykl vstup\n"
" --binary-files=TYP definuje typ binrnch soubor\n"
-" TYP me bt: 'binary', 'text' nebo "
-"'without-match'\n"
+" TYP me bt: 'binary', 'text' nebo 'without-match'\n"
" -a, --text jako --binary-files=text\n"
" -I jako --binary-files=without-match\n"
" -d, --directories=AKCE jak zpracovvat adrese. AKCE me bt:\n"
" `read', `recurse', `skip'\n"
-" -r, --recursive jako --directories=recurse\n"
+" -R, -r, --recursive jako --directories=recurse\n"
+" --include=VZOREK soubory kter vyhovuj vzorku, budou zpracovny\n"
+" --exclude=VZOREK soubory kter vyhovuj vzorku, budou peskoeny\n"
+" --exclude-from=SOUBOR soubory kter vyhovuj vzorkm ze SOUBORu, budou\n"
+" peskoeny\n"
" -L, --files-without-match vype pouze jmna soubor, ve kterch nebyl\n"
" VZOREK nalezen\n"
-" -l, --files-with-matches vype pouze jmna soubor, ve kterch byl "
-"VZOREK\n"
+" -l, --files-with-matches vype pouze jmna soubor, ve kterch byl VZOREK\n"
" nalezen\n"
" -c, --count vype pouze poet vyhovujcch dk na SOUBOR\n"
" -Z, --null vype nulov bajt za jmnem SOUBORu\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -248,12 +246,11 @@ msgstr ""
" -B, --before-context=POET vype POET dk ped vyhovujcm\n"
" -A, --after-context=POET vype POET dk za vyhovujcm\n"
" -C, --context=[POET] vype POET (2) dk kontextu (ped\n"
-" i za vyhovujcm). Je potlaeno pepnai -A a "
-"-B\n"
+" i za vyhovujcm). Je potlaeno pepnai -A a -B\n"
" -POET stejn se zadnm --context=NUM\n"
+" --color, --colour pouije barev k rozlien vyhovujcch etzc\n"
" -U, --binary neodstrauje znak CR na konci dku (MSDOS)\n"
-" -u, --unix-byte-offsets vypisuje pozici jako by CR nebyly v souboru "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets vypisuje pozici jako by CR nebyly v souboru (MSDOS)\n"
"\n"
" Jestlie nen zadn dn z pepna -[GEF], pak `egrep' pracuje jako\n"
"`grep -E', `fgrep' jako `grep -F' a `grep' jako `grep -G'. Jestlie SOUBOR\n"
@@ -262,63 +259,58 @@ msgstr ""
" Nvratov kd je 0 pi nalezen, 1 nevyhovoval-li dn dek a 2 pi\n"
"syntaktick nebo systmov chyb.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
" Chyby v programu oznamujte na adrese <bug-gnu-utils@gnu.org> (pouze\n"
"anglicky), pipomnky k pekladu zaslejte na adresu <cs@li.org> (esky).\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "zadny kolidujc vzorky"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "neznm obsluha adres"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "neukonen zpis potu opakovn"
+msgstr "neplatn maximln poet"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "neznm typ binrnho souboru"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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 ""
" Toto je voln programov vybaven; podmnky pro koprovn a roziovn\n"
-"naleznete ve zdrojovch textech. Toto programov vybaven je zcela BEZ "
-"ZRUKY,\n"
+"naleznete ve zdrojovch textech. Toto programov vybaven je zcela BEZ ZRUKY,\n"
"a to i bez zruky PRODEJNOSTI nebo VHODNOSTI PRO NJAK KONKRTN EL.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "Pepna -P nen podporovn"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "Pepnae -P a -z nemohou bt kombinovny"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "Neznm systmov chyba"
#: lib/getopt.c:675
#, c-format
@@ -393,10 +385,10 @@ msgstr "%s: pepna `-W %s' mus bt zadn bez argumentu\n"
#. 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.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:265
msgid "`"
msgstr ""
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
msgstr ""
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 00000000..9bbe1b8d
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,324 @@
+# Danish messages for GNU Grep version 2.4f.
+# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+# Kenneth Christiansen <kenneth@gnome.org>, 1999.
+# Keld Simonsen <keld@dkuug.dk>, 2000
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grep 2.4f.da.po\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-10-14 02:04+02:00\n"
+"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
+msgid "Memory exhausted"
+msgstr "Hukommelse opbrugt"
+
+#: src/dfa.c:448
+msgid "Unfinished \\ escape"
+msgstr "Ufrdig \\-beskyttelse"
+
+#. Cases:
+#. {M} - exact count
+#. {M,} - minimum count, maximum is infinity
+#. {M,N} - M through N
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
+msgid "unfinished repeat count"
+msgstr "ufrdigt gentagelsesantal"
+
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
+msgid "malformed repeat count"
+msgstr "ugyldigt gentagelsesantal"
+
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
+msgid "Unbalanced ["
+msgstr "Ubalanceret ["
+
+#: src/dfa.c:886
+msgid "Unbalanced ("
+msgstr "Ubalanceret ("
+
+#: src/dfa.c:1000
+msgid "No syntax specified"
+msgstr "Ingen syntaks angivet"
+
+#: src/dfa.c:1008
+msgid "Unbalanced )"
+msgstr "Ubalanceret )"
+
+#: src/dfa.c:1994
+msgid "out of memory"
+msgstr "ikke nok hukommelse"
+
+#: src/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flaget '%s' er flertydigt\n"
+
+#: src/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flaget '--%s' tillader ikke argumenter\n"
+
+#: src/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flaget '%c%s' tillader ikke argumenter\n"
+
+#: src/getopt.c:723 src/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flaget '%s' krver et argument\n"
+
+#. --option
+#: src/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukendt flag '--%s'\n"
+
+#. +option or -option
+#: src/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukendt flag '%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovligt flag -- %c\n"
+
+#: src/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldigt flag -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:815 src/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaget krver et argument -- %c\n"
+
+#: src/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flaget '-W %s' er flertydigt\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flaget '-W %s' tillader ikke argumenter\n"
+
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
+msgid "memory exhausted"
+msgstr "hukommelse opbrugt"
+
+#: src/grep.c:550 src/grep.c:1441
+msgid "writing output"
+msgstr "skriver uddata"
+
+#: src/grep.c:777
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr "Binr fil %s stemmer\n"
+
+#: src/grep.c:791
+msgid "(standard input)"
+msgstr "(standard inddata)"
+
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: advarsel: %s: %s\n"
+
+#: src/grep.c:888
+msgid "recursive directory loop"
+msgstr "rekursiv katalogsljfe"
+
+#: src/grep.c:938
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "Brug: %s [FLAG]... MNSTER [FIL]...\n"
+
+#: src/grep.c:939
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Prv '%s --help' for mere information.\n"
+
+#: src/grep.c:943
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+msgstr "Brug: %s [FLAG]... MNSTER [FIL] ...\n"
+
+#: src/grep.c:944
+#, c-format
+msgid ""
+"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Regexp selection and interpretation:\n"
+msgstr ""
+"Sg efter MNSTER i hver en FIL eller i standard inddata.\n"
+"Eksempel: %s -i 'hello verden' menu.h main.c\n"
+"\n"
+"Regexp tilvalg og betydning:\n"
+
+#: src/grep.c:949
+msgid ""
+" -E, --extended-regexp PATTERN is an extended regular expression\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression\n"
+msgstr ""
+" -E, --extended-regexp MNSTER er et udvidet regulrt udtryk\n"
+" -F, --fixed-strings MNSTER er et st af nylinje-separerede strenge\n"
+" -G, --basic-regexp MNSTER er et basalt regulrt udtryk\n"
+
+#: src/grep.c:953
+msgid ""
+" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -f, --file=FILE obtain PATTERN from FILE\n"
+" -i, --ignore-case ignore case distinctions\n"
+" -w, --word-regexp force PATTERN to match only whole words\n"
+" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
+msgstr ""
+" -e, --regexp=MNSTER brug MNSTER som et regulrt udtryk\n"
+" -f, --file=FIL tag MNSTER fra FIL\n"
+" -i, --ignore-case ignorr forskelle mellem store og sm bogstaver\n"
+" -w, --word-regexp f MNSTER til at passe kun p hele ord\n"
+" -x, --line-regexp f MNSTER til at passe kun p hele linjer\n"
+" -z, --null-data en datalinje slutter med en 0 byte, ikke ny linje\n"
+
+#: src/grep.c:960
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --invert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
+msgstr ""
+"\n"
+"Forskelligt:\n"
+" -s, --no-messages undertryk fejlmeddelser\n"
+" -v, --invert-match vlg linjer der ikke passer\n"
+" -V, --version udskriv versionsinformation og afslut\n"
+" --help vis denne hjlpetekst og afslut\n"
+" --mmap brug inddata via hukommelse om muligt\n"
+
+#: src/grep.c:968
+msgid ""
+"\n"
+"Output control:\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
+" -d, --directories=ACTION how to handle directories\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
+" -L, --files-without-match only print FILE names containing no match\n"
+" -l, --files-with-matches only print FILE names containing matches\n"
+" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
+msgstr ""
+"\n"
+"Output control:\n"
+" -b, --byte-offset udskriv byte afsttet i uddatalinjer\n"
+" -n, --line-number udskriv linjenummer i uddatalinjer\n"
+" -H, --with-filename udskriv filnavn for hver trffer\n"
+" -h, --no-filename undg indledende filnavn i uddata\n"
+" -q, --quiet, --silent undg al normal uddata\n"
+" --binary-files=TYPE antag at binre filer er TYPE\n"
+" TYPE er 'binary', 'text', eller 'without-match'.\n"
+" -a, --text det samme som --binary-files=text\n"
+" -I det samme som --binary-files=without-match\n"
+" -d, --directories=HANDLING hvordan kataloger skal behandles\n"
+" HANDLING er 'read', 'recurse', eller 'skip'.\n"
+" -r, --recursive det samme som --directories=recurse.\n"
+" -L, --files-without-match udskriv kun FIL navne der ikke indeholder trffere match\n"
+" -l, --files-with-matches udskriv kun FIL navne der indeholder trffere\n"
+" -c, --count udskriv kun antal af linjer med trffere per FIL\n"
+" -Z, --null udskriv en 0 byte efter FIL navn\n"
+
+#: src/grep.c:987
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overridden by -A or -B\n"
+" -NUM same as --context=NUM\n"
+" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
+" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
+"\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
+msgstr ""
+"\n"
+"Kontekst bestemmelse:\n"
+" -B, --before-context=NUM udskriv NUM linjer med foregende tekst\n"
+" -A, --after-context=NUM udskriv NUM linjer med efterflgende tekst\n"
+" -C, --context[=NUM] udskriv NUM (forvalgt 2) linjer af omgivende tekst\n"
+" medmindre andet angivet med -A eller -B\n"
+" -NUM det samme som --context=NUM\n"
+" -U, --binary fjern ikke CR tegn ved linieslut (MSDOS)\n"
+" -u, --unix-byte-offsets rapportr afst som om CR tegn ikke var der (MSDOS)\n"
+"\n"
+"`egrep' betyder `grep -E'. `fgrep' betyder `grep -F'.\n"
+"Uden en FIL, eller hvis FIL er -, ls standard inddata. Hvis mindre end\n"
+"to FILer er angivet, antag -h. Afslutningsstatus er 0 ved trffer, 1 ved ingen trffer,\n"
+"og 2 ved problemer.\n"
+
+#: src/grep.c:1002
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRapportr fejl til <bug-gnu-utils@gnu.org>.\n"
+
+#: src/grep.c:1012
+msgid "conflicting matchers specified"
+msgstr "konfliktende sgeudtryk angivet"
+
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
+msgid "invalid context length argument"
+msgstr "ugyldigt kontekstlngdeargument"
+
+#: src/grep.c:1273
+msgid "unknown directories method"
+msgstr "ukendt katalogmetode"
+
+#: src/grep.c:1358
+msgid "unknown binary-files type"
+msgstr "ukendt binr filtype"
+
+#: src/grep.c:1378
+#, c-format
+msgid "%s (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
+
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Ophavsret 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:1382
+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 ""
+"Dette er frit programmel, se kildekoden for kopieringsbetingelser. Der\n"
+"er INGEN garanti, ikke engang for SALGBARHED eller EGNETHED FOR NOGET \n"
+"SPECIELT FORML.\n"
diff --git a/po/de.po b/po/de.po
index fddfaf7d..e7ae84d5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,13 +1,13 @@
# German messages for GNU grep
-# Copyright (C) 1997-99, 2000, 2001 Free Software Foundation, Inc.
-# Martin von Lwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000, 2001
+# Copyright (C) 1997-99, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Martin von Löwis <martin@mira.isdn.cs.tu-berlin.de>, 1997-99, 2000, 2001, 2002
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-06-03 10:25+02:00\n"
-"Last-Translator: Martin von Lwis <martin@mira.isdn.cs.tu-berlin.de>\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-09 01:27+0100\n"
+"Last-Translator: Martin von Löwis <martin@v.loewis.de>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -15,16 +15,13 @@ msgstr ""
#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
msgid "Memory exhausted"
-msgstr "Virtueller Speicher erschpft."
+msgstr "Virtueller Speicher erschöpft."
# Is this message used only for [ without matching ],
# or for ] without [ as well?
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
-msgstr "ffnende [ ohne schlieende."
+msgstr "Öffnende [ ohne schließende."
#: src/dfa.c:741
msgid "Unfinished \\ escape"
@@ -36,80 +33,78 @@ msgstr "Unbeendete \\-Escape-Sequenz."
#. {M,N} - M through N
#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
msgid "unfinished repeat count"
-msgstr "Unbeendeter Wiederholungszhler."
+msgstr "Unbeendeter Wiederholungszähler."
#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
msgid "malformed repeat count"
-msgstr "Unfrmiger Wiederholungszhler."
+msgstr "Unförmiger Wiederholungszähler."
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
-msgstr "ffnende ( ohne schlieende."
+msgstr "Öffnende ( ohne schließende."
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Keine Syntax angegeben."
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
-msgstr "Schlieende ) ohne ffnende."
+msgstr "Schließende ) ohne öffnende."
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "Speicher ist alle."
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
-msgstr "Virtueller Speicher erschpft."
+msgstr "Virtueller Speicher erschöpft."
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
-msgstr "Ungltige Kontextlnge."
+msgstr "Ungültige Kontextlänge."
-#: src/grep.c:458
-#, fuzzy
+#: src/grep.c:475
msgid "input is too large to count"
-msgstr "Eingabe ist zu gro, um gezhlt zu werden."
+msgstr "Eingabe ist zu groß, um gezählt zu werden."
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
-msgstr "schreibe Ausgabe"
+msgstr "Politik, "
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
-msgstr "bereinstimmungen in Binrdatei %s.\n"
+msgstr "Übereinstimmungen in Binärdatei %s.\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(Standardeingabe)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "Warnung: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "Rekursive Verzeichnisschleife."
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "%s --help gibt Ihnen mehr Informationen.\n"
+msgstr "»%s --help« gibt Ihnen mehr Informationen.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,22 +115,23 @@ msgstr ""
"Suche nach MUSTER in jeder DATEI oder der Standardeingabe.\n"
"Beispiel: %s -i 'Hallo Welt' menu.h main.c\n"
"\n"
-"Auswahl und Interpretation regulrer Ausdrcke:\n"
+"Auswahl und Interpretation regulärer Ausdrücke:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
-" -E, --extended-regexp MUSTER ist ein erweiterter regulrer Ausdruck.\n"
+" -E, --extended-regexp MUSTER ist ein erweiterter regulärer Ausdruck.\n"
" -F, --fixed-strings MUSTER ist eine Menge Newline-getrennter \n"
" Zeichenketten.\n"
-" -G, --basic-regexp MUSTER ist ein regulrer Standardausdruck.\n"
+" -G, --basic-regexp MUSTER ist ein regulärer Standardausdruck.\n"
+" -P, --perl-regexp MUSTER ist ein regulärer Ausdruck, \n"
+" wie Perl ihn akzeptiert.\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -144,15 +140,15 @@ msgid ""
" -x, --line-regexp force PATTERN to match only whole lines\n"
" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-" -e, --regexp=MUSTER MUSTER als regulren Ausdruck verwenden.\n"
+" -e, --regexp=MUSTER MUSTER als regulären Ausdruck verwenden.\n"
" -f, --file=FILE MUSTER aus DATEI lesen.\n"
-" -i, --ignore-case Unterschied zwischen Gro- und Kleinschreibung\n"
+" -i, --ignore-case Unterschied zwischen Groß- und Kleinschreibung\n"
" ignorieren.\n"
-" -w, --word-regexp MUSTER pat nur auf ganze Wrter.\n"
-" -x, --line-regexp MUSTER pat nur auf ganze Zeilen.\n"
+" -w, --word-regexp MUSTER paßt nur auf ganze Wörter.\n"
+" -x, --line-regexp MUSTER paßt nur auf ganze Zeilen.\n"
" -z, --null-data Eine Zeile endet mit Nullbyte, nicht Newline.\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -164,14 +160,13 @@ msgid ""
msgstr ""
"\n"
"Verschiedenes:\n"
-" -s, --no-messages Fehlermeldungen unterdrcken.\n"
+" -s, --no-messages Fehlermeldungen unterdrücken.\n"
" -v, --revert-match Nicht-passende Zeilen anzeigen.\n"
-" -V, --version Versionnummer ausgeben und beenden.\n"
+" -V, --version Versionsnummer ausgeben und beenden.\n"
" --help Diese Hilfe ausgeben und beenden.\n"
-" --mmap Wenn mglich, Eingabe in den Speicher mappen.\n"
+" --mmap Wenn möglich, Eingabe in den Speicher mappen.\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -181,6 +176,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -188,11 +185,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -200,27 +198,36 @@ msgid ""
msgstr ""
"\n"
"Ausgabekontrolle:\n"
-" -b, --byte-offset Byte-Offset zusammen mit Ausgezeilen anzeigen.\n"
-" -n, --line-number Zeilennummber mit Ausgabezeilen anzeigen.\n"
-" -H, --with-filename Dateiname bei jeder bereinstimmung anzeigen.\n"
-" -h, --no-filename Anzeige des Dateinamens unterdrcken.\n"
-" -q, --quiet, --silent Alle normalen Ausgaben unterdrcken.\n"
-" --binary-files=TYP Binrdateien als TYP annehmen. TYP kann \n"
-" binary, text oder without-match sein.\n"
+" -m, --max-count=ZAHL Nach ZAHL Übereinstimmungen abbrechen.\n"
+" -b, --byte-offset Byte-Offset anzeigen.\n"
+" -n, --line-number Zeilennummer anzeigen.\n"
+" --line-buffered Jede Zeile einzeln (ungepuffert) ausgeben.\n"
+" -H, --with-filename Dateinamen bei jeder Übereinstimmung anzeigen.\n"
+" -h, --no-filename Dateinamen nicht anzeigen.\n"
+" --label=TEXT TEXT als Dateiname für Standardeingabe ausgeben.\n"
+" -o, --only-matching Nur den Teil der Zeile anzeigen, die mit MUSTER\n"
+" übereinstimmt.\n"
+" -q, --quiet, --silent Alle normalen Ausgaben unterdrücken.\n"
+" --binary-files=TYP Binärdateien als TYP annehmen. TYP kann \n"
+" »binary«, »text« oder »without-match« sein.\n"
" -a, --text Entspricht --binary-files=text.\n"
" -I Entspricht --binary-files=without-match.\n"
" -d, --directories=AKTION Verarbeitung von Verzeichnissen festlegen.\n"
" AKTION ist 'read', 'recurse', oder 'skip'.\n"
-" -r, --recursive quivalent zu --directories=recurse.\n"
+" -D, --devices=AKTION Verarbeitung von Gerätedateien, FIFOs und\n"
+" Sockets festlegt. AKTION ist »read« oder »write«.\n"
+" -R, -r, --recursive Äquivalent zu --directories=recurse.\n"
+" --include=MUSTER Dateien untersuchen, die auf MUSTER passen.\n"
+" --exclude=MUSTER Dateien überspringen, die auf MUSTER passen.\n"
+" --exclude-from=DATEI Dateien überspringen, die auf ein Muster \n"
+" in DATEI passen.\n"
" -L, --files-without-match Nur Namen von Dateien ausgeben, die keine\n"
-" bereinstimmung enthalten.\n"
-" -l, --files-with-matches Nur Dateinamen mit bereinstimmungen ausgeben.\n"
-" -c, --count Nur Zahl der passenden Zeilen pro Datei "
-"ausgeben.\n"
+" Übereinstimmung enthalten.\n"
+" -l, --files-with-matches Nur Dateinamen mit Übereinstimmungen ausgeben.\n"
+" -c, --count Nur Zahl der passenden Zeilen pro Datei ausgeben.\n"
" -Z, --null Null-Byte nach jedem Dateinamen ausgeben.\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -228,7 +235,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -239,23 +248,22 @@ msgid ""
msgstr ""
"\n"
"Kontextkontrolle:\n"
-" -B, --before-context=ZAHL ZAHL Zeilen von vorausgehendem Kontext "
-"anzeigen.\n"
+" -B, --before-context=ZAHL ZAHL Zeilen von vorausgehendem Kontext anzeigen.\n"
" -A, --after-context=ZAHL ZAHL Zeilen von folgendem Kontext anzeigen.\n"
-" -C, --context[=ZAHL] ZAHL (Standard ist 2) Zeilen Kontext anzeigen,\n"
-" wenn nicht mit -A oder -B anderes festgelegt "
-"ist.\n"
+" -C, --context=ZAHL ZAHL Zeilen Kontext anzeigen,\n"
" -ZAHL Wie --context=ZAHL.\n"
+" --color[=WENN], \n"
+" --colour=[WENN] Passende Textfragmente markieren.\n"
+" WENN kann »always«, »never« oder »auto« sein.\n"
" -U, --binary CR-Zeichen am Zeilenende belassen (MSDOS).\n"
-" -u, --unix-byte-offsets Offsets ausgeben, als fehlten CR-Zeichen "
-"(MSDOS).\n"
+" -u, --unix-byte-offsets Offsets ausgeben, als fehlten CR-Zeichen (MSDOS).\n"
"\n"
-"egrep bedeutet grep -E. fgrep bedeutet grep -F.\n"
-"Wenn DATEI fehlt oder - ist, wird die Standardeingabe gelesen.\n"
+"»egrep« bedeutet »grep -E«. »fgrep« bedeutet »grep -F«.\n"
+"Wenn DATEI fehlt oder »-« ist, wird die Standardeingabe gelesen.\n"
"Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
-"bereinstimmungen, 1 ohne, 2 bei Problemen.\n"
+"Übereinstimmungen, 1 ohne, 2 bei Problemen.\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -263,50 +271,51 @@ msgstr ""
"\n"
"Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "Festgelegte Vergleicher widersprechen einander."
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "Unbekannte Methode für Gerätedateien."
+
+#: src/grep.c:1430
msgid "unknown directories method"
-msgstr "Unbekannte Methode fr Verzeichnisse."
+msgstr "Unbekannte Methode für Verzeichnisse."
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1497
msgid "invalid max count"
-msgstr "Unbeendeter Wiederholungszhler."
+msgstr "Unbeendeter Maximalzähler."
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
-msgstr "Unbekannter Typ fr --binary-files."
+msgstr "Unbekannter Typ für »--binary-files«."
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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 ""
-"Dies ist freie Software; in den Quellen befinden sich die "
-"Lizenzbedingungen.\n"
-"Es gibt KEINERLEI Garantie; nicht einmal fr die TAUGLICHKEIT oder\n"
-"VERWENDBARKEIT FR EINEN BESTIMMTEN ZWECK.\n"
+"Dies ist freie Software; in den Quellen befinden sich die Lizenzbedingungen.\n"
+"Es gibt KEINERLEI Garantie; nicht einmal für die TAUGLICHKEIT oder\n"
+"VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.\n"
#: src/search.c:606
msgid "The -P option is not supported"
-msgstr "Die Option -P ist nicht untersttzt."
+msgstr "Die Option -P ist nicht unterstützt."
#: src/search.c:619
msgid "The -P and -z options cannot be combined"
-msgstr "Die Optionen -P und -z knnen nicht kombiniert werden."
+msgstr "Die Optionen -P und -z können nicht kombiniert werden."
#: lib/error.c:117
msgid "Unknown system error"
@@ -315,45 +324,45 @@ msgstr "Unbekannter Systemfehler."
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Die Option %s ist mehrdeutig.\n"
+msgstr "%s: Die Option »%s« ist mehrdeutig.\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Die Option %s erlaubt keinen Parameter.\n"
+msgstr "%s: Die Option »%s« erlaubt keinen Parameter.\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Die Option %c%s erlaubt keinen Parameter.\n"
+msgstr "%s: Die Option »%c%s« erlaubt keinen Parameter.\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Die Option %s verlangt einen Parameter.\n"
+msgstr "%s: Die Option »%s« verlangt einen Parameter.\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: Nicht erkannte Option --%s\n"
+msgstr "%s: Nicht erkannte Option »--%s«\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: Nicht erkannte Option %c%s.\n"
+msgstr "%s: Nicht erkannte Option »%c%s«.\n"
#. 1003.2 specifies the format of this message.
#: lib/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
-msgstr "%s: Ungltige Option -- %c.\n"
+msgstr "%s: Ungültige Option -- %c.\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: Ungltige Option -- %c.\n"
+msgstr "%s: Ungültige Option -- %c.\n"
#. 1003.2 specifies the format of this message.
#: lib/getopt.c:815 lib/getopt.c:945
@@ -364,12 +373,12 @@ msgstr "%s: Option verlangt einen Parameter -- %c.\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option -W %s ist zweideutig.\n"
+msgstr "%s: Option »-W %s« ist zweideutig.\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option -W %s erlaubt keinen Parameter.\n"
+msgstr "%s: Option »-W %s« erlaubt keinen Parameter.\n"
#. Get translations for open and closing quotation marks.
#.
@@ -387,8 +396,8 @@ msgstr "%s: Option -W %s erlaubt keinen Parameter.\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr ""
+msgstr "»"
#: lib/quotearg.c:260
msgid "'"
-msgstr ""
+msgstr "«"
diff --git a/po/el.po b/po/el.po
index ff582021..44cf9ede 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
"PO-Revision-Date: 2001-05-07 00:02+0000\n"
"Last-Translator: Simos Xenitellis <S.Xenitellis@rhbnc.ac.uk>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -15,7 +15,7 @@ msgstr ""
# src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
# src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:827
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr " "
@@ -23,16 +23,16 @@ msgstr " "
# src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
# src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
# src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
+#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
+#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
+#: src/dfa.c:1045 src/dfa.c:1046
msgid "Unbalanced ["
msgstr " ["
# src/dfa.c:444
# src/dfa.c:452
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr " \\"
@@ -42,37 +42,37 @@ msgstr " \\"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr " "
# src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
# src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr " "
# src/dfa.c:841
# src/dfa.c:849
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr " ("
# src/dfa.c:962
# src/dfa.c:970
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr " "
# src/dfa.c:970
# src/dfa.c:978
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr " )"
# src/dfa.c:1990
# src/dfa.c:1998
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr " "
@@ -80,8 +80,8 @@ msgstr " "
# src/kwset.c:190
# src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184
# src/kwset.c:190
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
+#: src/search.c:103 src/search.c:223 src/search.c:307
msgid "memory exhausted"
msgstr " "
@@ -91,62 +91,62 @@ msgstr " "
msgid "invalid context length argument"
msgstr " "
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
msgstr ""
# src/grep.c:392 src/grep.c:1034
# src/grep.c:487 src/grep.c:1284
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr " "
# src/grep.c:715
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr " %s \n"
# src/grep.c:964 src/grep.c:1015
# src/grep.c:730
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "( )"
# src/grep.c:293
# src/grep.c:366
-#: src/grep.c:923
+#: src/grep.c:931
#, fuzzy, c-format
msgid "warning: %s: %s\n"
msgstr "%s: : %s: %s\n"
# src/grep.c:844
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr " "
# src/grep.c:597
# src/grep.c:862
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s []... []...\n"
# src/grep.c:598
# src/grep.c:863
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " `%s --help' .\n"
# src/grep.c:602
# src/grep.c:867
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s []... [] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -155,7 +155,7 @@ msgid ""
"Regexp selection and interpretation:\n"
msgstr ""
-#: src/grep.c:985
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -165,7 +165,7 @@ msgstr ""
# src/grep.c:603
# src/grep.c:868
-#: src/grep.c:990
+#: src/grep.c:998
#, fuzzy
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
@@ -178,10 +178,8 @@ msgstr ""
" .\n"
"\n"
" regexp :\n"
-" -E, --extended-regexp "
-"\n"
-" -F, --fixed-regexp "
-"-\n"
+" -E, --extended-regexp \n"
+" -F, --fixed-regexp -\n"
" \n"
" -G, --basic-regexp \n"
" -e, --regexp= \n"
@@ -194,7 +192,7 @@ msgstr ""
# src/grep.c:615
# src/grep.c:880
-#: src/grep.c:997
+#: src/grep.c:1005
#, fuzzy
msgid ""
"\n"
@@ -214,7 +212,7 @@ msgstr ""
# src/grep.c:622
# src/grep.c:887
-#: src/grep.c:1005
+#: src/grep.c:1013
#, fuzzy
msgid ""
"\n"
@@ -233,10 +231,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --include=PATTERN files that match PATTERN will be examine\n"
+" --exclude=PATTERN files that match PATTERN will be skip.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skip.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -254,8 +251,7 @@ msgstr ""
" -a, --text \n"
" -d, --directories= \n"
" 'read', 'recurse' 'skip'.\n"
-" ( , "
-").\n"
+" ( , ).\n"
" -r, --recursive --directories=recurse.\n"
" -L, --files-without-match \n"
" \n"
@@ -265,7 +261,7 @@ msgstr ""
# src/grep.c:633
# src/grep.c:902
-#: src/grep.c:1029
+#: src/grep.c:1037
#, fuzzy
msgid ""
"\n"
@@ -293,8 +289,7 @@ msgstr ""
" \n"
" -A -B\n"
" -NUM --context=\n"
-" -U, --binary CR EOL "
-"(MSDOS)\n"
+" -U, --binary CR EOL (MSDOS)\n"
" -u, --unix-byte-offsets \n"
" CR (MSDOS)\n"
"\n"
@@ -306,54 +301,50 @@ msgstr ""
# src/grep.c:647
# src/grep.c:917
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-" <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\n <bug-gnu-utils@gnu.org>.\n"
# src/grep.c:829
# src/grep.c:1112
-#: src/grep.c:1054
+#: src/grep.c:1062
#, fuzzy
msgid "conflicting matchers specified"
msgstr " , "
# src/grep.c:1133
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr " "
# src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
# src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
-#: src/grep.c:1414
+#: src/grep.c:1422
#, fuzzy
msgid "invalid max count"
msgstr " "
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr ""
# src/grep.c:915
# src/grep.c:1219
-#: src/grep.c:1535
+#: src/grep.c:1543
#, fuzzy, c-format
msgid "%s (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
# src/grep.c:917
# src/grep.c:1221
-#: src/grep.c:1537
+#: src/grep.c:1545
#, fuzzy
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, Free Software Foundation, Inc.\n"
# src/grep.c:919
# src/grep.c:1223
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -362,11 +353,11 @@ msgstr ""
". , \n"
" .\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
msgstr ""
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
msgstr ""
@@ -469,74 +460,74 @@ msgstr "%s: `-W %s' \n"
#. 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.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:265
msgid "`"
msgstr ""
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
msgstr ""
-# src/getopt1.c:132
-# src/getopt1.c:132
+#~ # src/getopt1.c:132
+#~ # src/getopt1.c:132
#~ msgid "option %s"
#~ msgstr " %s"
-# src/getopt1.c:134
-# src/getopt1.c:134
+#~ # src/getopt1.c:134
+#~ # src/getopt1.c:134
#~ msgid " with arg %s"
#~ msgstr " %s"
-# src/getopt1.c:149
-# src/getopt1.c:149
+#~ # src/getopt1.c:149
+#~ # src/getopt1.c:149
#~ msgid "digits occur in two different argv-elements.\n"
#~ msgstr " argv-.\n"
-# src/getopt1.c:151
-# src/getopt1.c:151
+#~ # src/getopt1.c:151
+#~ # src/getopt1.c:151
#~ msgid "option %c\n"
#~ msgstr " %c\n"
-# src/getopt1.c:155
-# src/getopt1.c:155
+#~ # src/getopt1.c:155
+#~ # src/getopt1.c:155
#~ msgid "option a\n"
#~ msgstr " \n"
-# src/getopt1.c:159
-# src/getopt1.c:159
+#~ # src/getopt1.c:159
+#~ # src/getopt1.c:159
#~ msgid "option b\n"
#~ msgstr " \n"
-# src/getopt1.c:163
-# src/getopt1.c:163
+#~ # src/getopt1.c:163
+#~ # src/getopt1.c:163
#~ msgid "option c with value `%s'\n"
#~ msgstr " `%s'\n"
-# src/getopt1.c:167
-# src/getopt1.c:167
+#~ # src/getopt1.c:167
+#~ # src/getopt1.c:167
#~ msgid "option d with value `%s'\n"
#~ msgstr " `%s'\n"
-# src/getopt1.c:174
-# src/getopt1.c:174
+#~ # src/getopt1.c:174
+#~ # src/getopt1.c:174
#~ msgid "?? getopt returned character code 0%o ??\n"
#~ msgstr "?? getopt 0%o ??\n"
-# src/getopt1.c:180
-# src/getopt1.c:180
+#~ # src/getopt1.c:180
+#~ # src/getopt1.c:180
#~ msgid "non-option ARGV-elements: "
#~ msgstr "ARGV- : "
-# src/grep.c:800 src/grep.c:805 src/grep.c:810
-# src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
+#~ # src/grep.c:800 src/grep.c:805 src/grep.c:810
+#~ # src/grep.c:1083 src/grep.c:1088 src/grep.c:1093
#~ msgid "you may specify only one of -E, -F, or -G"
#~ msgstr " -E, -F -G"
-# src/obstack.c:467
-# src/obstack.c:467
+#~ # src/obstack.c:467
+#~ # src/obstack.c:467
#~ msgid "memory exhausted\n"
#~ msgstr " \n"
-# src/grep.c:1027 src/grep.c:1030
+#~ # src/grep.c:1027 src/grep.c:1030
#~ msgid "(standard input)\n"
#~ msgstr "( )\n"
diff --git a/po/eo.po b/po/eo.po
index 4651c080..d5751dcf 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
"PO-Revision-Date: 2001-05-13 14:30+01:00\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -14,18 +14,18 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-3\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Memoro elerpita"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
+#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
+#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
+#: src/dfa.c:1045 src/dfa.c:1046
msgid "Unbalanced ["
msgstr "Senpara ["
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Nefinita \\-eskapo"
@@ -33,32 +33,32 @@ msgstr "Nefinita \\-eskapo"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "nefinita ripetonombro"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "misformita ripetonombro"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Senpara ("
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Mankas sintakso"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Senpara )"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "memoro elerpita"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
+#: src/search.c:103 src/search.c:223 src/search.c:307
msgid "memory exhausted"
msgstr "memoro elerpita"
@@ -66,48 +66,48 @@ msgstr "memoro elerpita"
msgid "invalid context length argument"
msgstr "nevalida argumento por kunteksto-longo"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
msgstr "enigo estas tro granda por nombrado"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "skribas eligon"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binara dosiero %s kongruas\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(normala enigo)"
-#: src/grep.c:923
+#: src/grep.c:931
#, c-format
msgid "warning: %s: %s\n"
msgstr "averto: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "rekursa dosieruja ciklo"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uzado: %s [OPCIO]... ABLONO [DOSIERO]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Provu `%s --help' por pliaj informoj.\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uzado: %s [OPCIO]... ABLONO [DOSIERO] ...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"Elekto kaj interpreto de regulaj esprimoj:\n"
-#: src/grep.c:985
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -128,12 +128,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp ABLONO estas etendita regula esprimo\n"
-" -F, --fixed-strings ABLONO estas aro da enoj apartigitaj de "
-"linifinoj\n"
+" -F, --fixed-strings ABLONO estas aro da enoj apartigitaj de linifinoj\n"
" -G, --basic-regexp ABLONO estas simpla regula esprimo\n"
" -P, --perl-regexp ABLONO estas regula esprimo de Perl\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,10 +146,9 @@ msgstr ""
" -i, --ignore-case ignori diferencojn de uskleco\n"
" -w, --word-regexp devigi al ABLONO kongrui nur al tutaj vortoj\n"
" -x, --line-regexp devigi al ABLONO kongrui nur al tutaj linioj\n"
-" -z, --null-data datenlinio finias per bitoko 0, ne per "
-"linifino\n"
+" -z, --null-data datenlinio finias per bitoko 0, ne per linifino\n"
-#: src/grep.c:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,8 +166,7 @@ msgstr ""
" --help montri i tiun helpon kaj fini\n"
" --mmap uzi memoromapon por la enigo, se eble\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -187,10 +184,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --include=PATTERN files that match PATTERN will be examine\n"
+" --exclude=PATTERN files that match PATTERN will be skip.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skip.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -206,25 +202,21 @@ msgstr ""
" -h, --no-filename subpremi la prefiksan dosiernomon e eligo\n"
" -q, --quiet, --silent subpremi ian normalan eligadon\n"
" --binary-files=SPECO supozi, ke binaraj dosieroj estas de SPECO\n"
-" SPECO estas 'binary', 'text', a "
-"'without-match'\n"
+" SPECO estas 'binary', 'text', a 'without-match'\n"
" -a, --text same kiel --binary-files=text\n"
" -I same kiel --binary-files=without-match\n"
-" -d, --directories=AGO kiel trakti dosierujojn; AGO estas 'read' "
-"(legi),\n"
+" -d, --directories=AGO kiel trakti dosierujojn; AGO estas 'read' (legi),\n"
" 'recurse' (rekurse), a 'skip' (ignori).\n"
" -R, -r, --recursive same kiel --directories=recurse.\n"
" --include=ABLONO ekzameni dosierojn, kiuj kongruas kun ABLONO\n"
" --exclude=ABLONO ignori dosierojn, kiuj kongruas kun ABLONO\n"
-" --exclude-from=DOS ignori dosierojn, kiuj kongruas kun ablono en "
-"DOS\n"
+" --exclude-from=DOS ignori dosierojn, kiuj kongruas kun ablono en DOS\n"
" -L, --files-without-match presi nur dosiernomojn sen trafo\n"
" -l, --files-with-matches presi nur dosiernomojn kun trafoj\n"
-" -c, --count presi nur nombron de kongruaj linioj en iu "
-"dosiero\n"
+" -c, --count presi nur nombron de kongruaj linioj en iu dosiero\n"
" -Z, --null presi la bitokon 0 post dosiernomo\n"
-#: src/grep.c:1029
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -249,48 +241,43 @@ msgstr ""
" -NOM same kiel --context=NOM\n"
" --color, --colour uzi markilojn por distingi la kongruan enon\n"
" -U, --binary ne forigi \\r-signojn e linifino (MSDOS)\n"
-" -u, --unix-byte-offsets doni bitoknumerojn, kvaza \\r-signoj mankus "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets doni bitoknumerojn, kvaza \\r-signoj mankus (MSDOS)\n"
"\n"
"'egrep' signifas 'grep -E'. 'fgrep' signifas 'grep -F'.\n"
"Kiam DOSIERO mankas, a DOSIERO estas -, legi la normalan enigon. Se malpli\n"
"ol du DOSIEROj estas donitaj, supozi -h. Finvaloro estas 0, se estis trafo,\n"
"1, se ne estis, kaj 2 e eraro.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Raportu cimojn al <bug-gnu-utils@prep.ai.mit.edu>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRaportu cimojn al <bug-gnu-utils@prep.ai.mit.edu>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "malkongruaj kompariloj estas indikitaj"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "nekonata dosieruja metodo"
-#: src/grep.c:1414
+#: src/grep.c:1422
msgid "invalid max count"
msgstr "nevalida maksimuma nombro"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "nekonata speco de binara dosiero"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Kopirajto 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -298,11 +285,11 @@ msgstr ""
"i tiu estas libera programo; vidu la fonton por kopikondioj. Estas\n"
"NENIA GARANTIO, e ne pri KOMERCA KVALITO a ADEKVATECO POR DIFINITA CELO.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
msgstr "La opcio -P ne estas disponata"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
msgstr "Ne eblas kombini la opciojn -P kaj -z"
@@ -383,10 +370,10 @@ msgstr "%s: opcio `-W %s' ne akceptas argumenton\n"
#. 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.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:265
msgid "`"
msgstr "'"
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
msgstr "'"
diff --git a/po/es.po b/po/es.po
index 903434f4..9dab6ff4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,13 +1,13 @@
# Mensajes en espaol para GNU grep.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-# Enrique Melero Gmez <melero@iprolink.ch>, 1996.
-# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Enrique Melero Gmez <melero@eurolands.com>, 1996.
+# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001, 2002.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-06-09 15:44+0200\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-10 13:49+0100\n"
"Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memoria agotada"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ desemparejado"
@@ -41,75 +38,74 @@ msgstr "contador de repeticin sin terminar"
msgid "malformed repeat count"
msgstr "contador de repeticin errneo"
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "( desemparejado"
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "No se ha especificado ninguna sintaxis"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr ") desemparejado"
# FIXME. Comunicar al autor que esto es repeticin...
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "memoria agotada"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memoria agotada"
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "longitud de contexto invlida"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "la entrada es demasiado grande para contar"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "escribiendo el resultado"
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Coincidencia en el fichero binario %s\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entrada estndar)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "atencin: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "bucle de directorio recursivo"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIN]... PATRN [FICHERO]...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para ms informacin.\n"
# FIXME: Dice [FILE] ... en vez de [FILE]... Ser un error?
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Modo de empleo: %s [OPCIN]... PATRN [FICHERO] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -122,7 +118,7 @@ msgstr ""
"\n"
"Seleccin e interpretacin de Expreg:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -135,7 +131,7 @@ msgstr ""
" -G, --basic-regexp PATRN es una expresin regular bsica\n"
" -P, --perl-regexp PATRN es una expresin regular en Perl\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -154,7 +150,7 @@ msgstr ""
" -z, --null-data una lnea de datos termina en un byte 0, no\n"
" en un carcter de nueva lnea\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -170,11 +166,9 @@ msgstr ""
" -v, --invert-match selecciona las lneas que no coinciden\n"
" -V, --version muestra la versin y finaliza\n"
" --help muestra esta ayuda y finaliza\n"
-" --mmap utiliza entrada asignada en memoria si es "
-"posible\n"
+" --mmap utiliza entrada asignada en memoria si es posible\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -184,6 +178,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -191,11 +187,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -213,6 +210,10 @@ msgstr ""
" coincidencia\n"
" -h, --no-filename suprime los nombres de los ficheros en\n"
" el resultado\n"
+" --label=ETIQUETA muestra ETIQUETA como nombre de fichero para la\n"
+" entrada estndar\n"
+" -o, --only-matching muestra solamente la parte de una lnea que\n"
+" encaja con PATRN\n"
" -q, --quiet, --silent suprime todo el resultado normal\n"
" --binary-files=TIPO supone que los ficheros binarios son TIPO\n"
" TIPO es `binary', `text', o `without-match'\n"
@@ -220,23 +221,22 @@ msgstr ""
" -I equivalente a --binary-files=without-match\n"
" -d, --directories=ACCIN especifica cmo manejar los directorios\n"
" ACCIN es 'read', 'recurse', o 'skip'\n"
+" -D, --devices=ACCIN especifica cmo manejar dispositivos, FIFOs y\n"
+" `sockets', puede ser 'read' o 'skip'\n"
" -R, -r, --recursive equivalente a --directories=recurse\n"
" --include=PATRN examina los ficheros que encajan con PATRN\n"
" --exclude=PATRN se salta los ficheros que encajan con PATRN\n"
-" --exclude-from=FICHERO se salta los ficheros que encajan con los "
-"patrones\n"
+" --exclude-from=FICHERO se salta los ficheros que encajan con los patrones\n"
" de FICHERO\n"
" -L, --files-without-match muestra solamente los nombres de FICHEROs\n"
" que no contienen ninguna coincidencia\n"
" -l, --files-with-matches muestra solamente los nombres de FICHEROs\n"
" que contienen alguna coincidencia\n"
-" -c, --count muestra solamente el total de lneas que "
-"coinciden\n"
+" -c, --count muestra solamente el total de lneas que coinciden\n"
" por cada FICHERO\n"
-" -Z, --null imprime un byte 0 despus del nombre del "
-"FICHERO\n"
+" -Z, --null imprime un byte 0 despus del nombre del FICHERO\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -244,7 +244,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -259,7 +261,9 @@ msgstr ""
" -A, --after-context=NM muestra NM lneas de contexto posterior\n"
" -C, --context=NM muestra NM lneas de contexto\n"
" -NM lo mismo que --context=NM\n"
-" --color, --colour distingue con marcadores la cadena que encaja\n"
+" --color[=CUNDO],\n"
+" --colour[=CUNDO] distingue con marcadores la cadena que encaja\n"
+" CUNDO puede ser `always', `never' o `auto'.\n"
" -U, --binary no elimina los caracteres de retorno de carro\n"
" finales de lnea (MSDOS)\n"
" -u, --unix-byte-offsets cuenta los desplazamientos como si no hubiera\n"
@@ -270,13 +274,13 @@ msgstr ""
"Si se dan menos de dos FICHEROs, se supone -h. La salida es 0 si hay\n"
"coincidencias, 1 si no las hay, y 2 en caso de problema\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
-"Comunicar `bugs' a <bug-gnu-utils@gnu.org>.\n"
+"Comunicar bichos a <bug-gnu-utils@gnu.org>.\n"
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiz es que getopt() lo he entendido mal
@@ -289,34 +293,38 @@ msgstr ""
#
# No me gusta nada lo de opcin "a buscar".
# Se admiten sugerencias. sv
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "se han especificado expresiones conflictivas"
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "mtodo de dispositivos desconocido"
+
# Nota: Se refiere a la opcin --directories=ACCIN cuando ACCIN
# no es `read', `recurse' o `skip'.
-#: src/grep.c:1347
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mtodo de directorios desconocido"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "contador mximo invlido"
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo binary-files desconocido"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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"
@@ -454,8 +462,7 @@ msgstr "'"
# Prefiero dejarlo en solamente un patrn
# Pero entonces no queda claro que *debe haber uno*, y parece que
# es uno como mximo (siendo el mnimo 0). sv
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+#~ msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
#~ msgstr "Debe haber un y solamente un PATRN, `-e PATRN', o `-f FICHERO'.\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
diff --git a/po/et.po b/po/et.po
index 3e9346e4..06a59844 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,12 +1,12 @@
# Estonian translations for grep
# Copyright (C) 2000 Free Software Foundation, Inc.
-# Toomas Soome <tsoome@ut.ee>, 2000.
+# Toomas Soome <tsoome@ut.ee>, 2002.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-05-13 11:12+02:00\n"
+"Project-Id-Version: grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-07 13:09+0200\n"
"Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Mlu on otsas"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "Balanseerimata ["
@@ -40,73 +37,72 @@ msgstr "lpetamata korduste arv"
msgid "malformed repeat count"
msgstr "vigane korduste arv"
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "Balanseerimata ("
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Sntaksit pole mratud"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr "Balanseerimata )"
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "mlu on otsas"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "mlu on otsas"
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "vigane konteksti pikkuse argument"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "sisend on loendamiseks liiga suur"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "kirjutan vljundit"
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Kahendfail %s sobib\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standardsisend)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "hoiatus: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "rekursiivne kataloogipuu tskkel"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Kasuta: %s [VTI]... MUSTER [FAIL] ...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Lisainfo saamiseks proovige vtit `%s --help'.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Kasuta: %s [VTI]... MUSTER [FAIL] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Regulaaravaldise valik ja interpreteerimine:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp MUSTER on lihtne regulaaravaldis\n"
" -P, --perl-regexp MUSTER on Perl regulaaravaldis\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,7 +143,7 @@ msgstr ""
" -x, --line-regexp kasuta MUSTRIT ridade leidmiseks\n"
" -z, --null-data andmerida lppeb baidil 0, mitte reavahetusel\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,8 +161,7 @@ msgstr ""
" --help esita see abiinfo ja lpeta t\n"
" --mmap kasuta kui vimalik sisendi mllu laadimist\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -176,6 +171,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -183,11 +180,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -208,6 +206,8 @@ msgstr ""
" -I sama, kui --binary-files=without-match\n"
" -d, --directories=TEGEVUS kuidas ksitleda katalooge\n"
" TEGEVUS on 'read', 'recurse' vi 'skip'\n"
+" -D, --devices=TEGEVUS kuidas ksitleda seadmeid, FIFO ja pistik faile\n"
+" TEGEVUS on 'read' vi 'skip'\n"
" -R, -r, --recursive sama, kui --directories=recurse\n"
" --include=MUSTER vaadeldakse mustrile MUSTER vastavaid faile\n"
" --exclude=MUSTER mustrile MUSTER vastavad failid jetakse vahele\n"
@@ -218,7 +218,7 @@ msgstr ""
" -c, --count trki ainult leitud ridade arv faili kaupa\n"
" -Z, --null trki peale filinime bait 0\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -226,7 +226,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -241,19 +243,19 @@ msgstr ""
" -A, --after-context=NUM trki NUM rida jrgnevat konteksti\n"
" -C, --context[=NUM] trki NUM rida vljund konteksti\n"
" -NUM sama, kui --context=NUM\n"
-" --color, --colour kasuta otsitava sne eristamiseks markereid\n"
+" --color[=MILLAL],\n"
+" --colour[=MILLAL] kasuta otsitava sne eristamiseks markereid\n"
+" MILLAL vib olla `always', `never' vi `auto'.\n"
" -U, --binary ra eemalda rea lpust CR smboleid (MSDOS)\n"
-" -u, --unix-byte-offsets teata aadressid CR smboleid arvestamata "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets teata aadressid CR smboleid arvestamata (MSDOS)\n"
"\n"
"`egrep' thendab `grep -E'. `fgrep' thendab `grep -F'.\n"
-"Kui FAIL pole antud vi kui FAIL vrtus on -, loeb standardsisendit. Kui "
-"on\n"
+"Kui FAIL pole antud vi kui FAIL vrtus on -, loeb standardsisendit. Kui on\n"
"antud vhem kui kaks faili, eeldatakse vtit -h. Kui muster leitakse,\n"
"lpetab programm t koodiga 0, kui ei leita, siis koodiga 1 ja\n"
"kui oli mingi muu probleem, siis koodiga 2.\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -261,33 +263,36 @@ msgstr ""
"\n"
"Teatage palun vigadest aadressil <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "mrati konfliktsed otsijad"
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "tundmatu seadmete meetod"
+
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "tundmatu kataloogide meetod"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "vigane maksimum"
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tundmatu kahendfailide tp"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr ""
-"Autoriigus 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Autoriigus 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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"
diff --git a/po/fr.po b/po/fr.po
index 0a53233d..d7dd2498 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-08-13 08:00-0500\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-10 08:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Mmoire puise."
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ non pair"
@@ -40,73 +37,72 @@ msgstr "dcompte de rptition non termin."
msgid "malformed repeat count"
msgstr "dcompte de rptition mal form."
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "( non pair"
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Aucune syntaxe spcifi"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr ") non pair"
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "Mmoire puise."
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "Mmoire puise."
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "paramtre de contexte de longueur invalide"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "ce qui est en entre est trop grand pour tre compt"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "Gnration du rsultat."
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Fichier binaire %s concorde\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entre standard)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "AVERTISSEMENT: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "boucle rcursive sur le rpertoire"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
+msgstr "Pour en savoir davantage, faites: %s --help.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -115,11 +111,11 @@ msgid ""
"Regexp selection and interpretation:\n"
msgstr ""
"Recherche du PATRON dans chaque FICHIER ou sur l'entre standard.\n"
-"Exemple: %s -i 'hello world' menu.h main.c\n"
+"Exemple: %s -i 'hello world menu.h main.c\n"
"\n"
"Slection et interprtation de l'expression rgulire:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -127,12 +123,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp PATRON est une expression regulire tendue\n"
-" -F, --fixed-regexp PATRON est une chane fixe spare par des "
-"retour de chariot\n"
+" -F, --fixed-regexp PATRON est une chane fixe spare par des retour de chariot\n"
" -G, --basic-regexp PATRON est une expression rgulire de base\n"
" -P, --perl-regexp PATRON est une expression rgulire en Perl\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -144,14 +139,12 @@ msgstr ""
" -e, --regexp=PATTERN utiliser le PATRON comme expression rgulire\n"
" -f, --file=FILE obtenir le PATRON du FICHIER\n"
" -i, --ignore-case ignorer la distrinction de la casse\n"
-" -w, --word-regexp forcer l'appariement du PATRON que sur des mots "
-"complets\n"
-" -x, --line-regexp forcer l'appariement du PATRON que sur des "
-"lignes entires\n"
+" -w, --word-regexp forcer l'appariement du PATRON que sur des mots complets\n"
+" -x, --line-regexp forcer l'appariement du PATRON que sur des lignes entires\n"
" -z, --null-data terminer la ligne de donnes par ZRO et\n"
" non pas par un retour de chariot\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -167,11 +160,9 @@ msgstr ""
" -v, --revert-match slectionner les lignes sans concordances\n"
" -V, --version afficher le nom et la version du logiciel\n"
" --help afficher l'aide et quitter\n"
-" --mmap utiliser la table de mmoire l'entre si "
-"possible\n"
+" --mmap utiliser la table de mmoire l'entre si possible\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -181,6 +172,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -188,11 +181,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -205,24 +199,26 @@ msgstr ""
" lignes traites\n"
" -n, --line-number afficher les numros de lignes des\n"
" lignes traites\n"
+" --line-buffered vider la sortie pour chaque ligne\n"
" -H, --with-filename afficher le nom de fichier pour\n"
" chaque concordance\n"
" -h, --no-filename supprimer le prfixe du nom de fichier\n"
" sur la sortie\n"
+" --label=ETIQUETTE afficher l'TIQUETTE comme un nom de\n"
+" fichier sur l'entre standard\n"
+" -o, --only-matching afficher la partie d'une ligne concordant avec le PATRON\n"
" -q, --quiet, --silent supprimer tout affichage en sortie\n"
" --binary-files=TYPE assumer que les fichiers binaires sont de\n"
-" TYPE soit 'binary', 'text', ou 'without-match'\n"
+" TYPE soit binary, text, ou without-match,\n"
" -a, --text ne pas supprimer la sortie binaire\n"
" -I quivalent --binary-files=without-match\n"
" -d, --directories=ACTION traiter les rpertoires selon l'ACTION\n"
-" 'read' (lecture), 'recurse' (rcursivit),\n"
-" ou 'skip' (escamotage).\n"
+" read (lecture), recurse (rcursivit),\n"
+" ou skip (escamotage).\n"
" -R, -r, --recursive quivalent --directories=recurse\n"
" --include=PATRON fichiers concordant au PATRON seront examins\n"
-" --exclude=PATRON fichiers concordant au PATRON ne seront pas "
-"examins\n"
-" --exclude-from=FICHIER fichiers dont le PATRON concorde dans le "
-"fichierseront escamots\n"
+" --exclude=PATRON fichiers concordant au PATRON ne seront pas examins\n"
+" --exclude-from=FICHIER fichiers dont le PATRON concorde dans le fichierseront escamots\n"
" -L, --files-without-match afficher seulement les noms des fichiers\n"
" ne contenant pas de concordance\n"
" -l, --files-with-matches afficher seulement les noms des fichiers\n"
@@ -231,7 +227,7 @@ msgstr ""
" concordantes par fichier\n"
" -Z, --null afficher l'octet ZRO aprs le nom du fichier\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -239,7 +235,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -255,20 +253,21 @@ msgstr ""
" -C, --context[=N] imprimer N lignes (2 par dfaut) du contexte\n"
" moins que -A ou -B ne soit spcifi\n"
" -N identique --context=N\n"
-" --color, --colour utiliser des marqueurs pour distinguer les\n"
+" --color[=DATE],\n"
+" --colour[=DATE] utiliser des marqueurs pour distinguer les\n"
" chanes concordantes\n"
" -U, --binary ne pas enlever les caractres CR sur \n"
" les fins de lignes (MS-DOS)\n"
" -u, --unix-byte-offsets afficher les adresses relatives comme si\n"
" aucun CR n'tait prsent (MS-DOS)\n"
"\n"
-"`egrep' est quivalent `grep -E'. `fgrep' est quivalent `grep -F'.\n"
+"egrep est quivalent grep -E. fgrep est quivalent grep -F.\n"
"Sans FICHIER, ou si - est utilis comme nom de FICHIER, la lecture\n"
"se fait de l'entre standard. S'il y a moins de 2 FICHIERS, l'option -h\n"
"est implicite. Termine avec 0 s'il y a concordance avec 1 si aucune.\n"
"Termine avec 2 s'il y a des erreurs de syntaxe ou de systme.\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -276,34 +275,38 @@ msgstr ""
"\n"
"Rapporter toutes anomalies <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "oprateurs de concordance spcifis en conflit"
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "mthode inconnue pour les priphrique"
+
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mthode inconnue des rpertoires"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "dcompte maximal invalide."
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "type de fichier binaire inconnu"
# msgid "GNU grep version %s"
# msgstr "grep de GNU version %s"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (grep de GNU) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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"
@@ -327,34 +330,34 @@ msgstr "Erreur systme inconnue"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option `%s' est ambigu.\n"
+msgstr "%s: l'option %s est ambigu.\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option `--%s' ne permet pas de paramtre.\n"
+msgstr "%s: l'option --%s ne permet pas de paramtre.\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option `%c%s' ne permet pas de paramtre.\n"
+msgstr "%s: l'option %c%s ne permet pas de paramtre.\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option `%s' requiert un paramtre.\n"
+msgstr "%s: l'option %s requiert un paramtre.\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: l'option `--%s' n'est pas reconnue.\n"
+msgstr "%s: l'option --%s n'est pas reconnue.\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: l'option `%c%s' n'est pas reconnue.\n"
+msgstr "%s: l'option %c%s n'est pas reconnue.\n"
#. 1003.2 specifies the format of this message.
#: lib/getopt.c:782
@@ -376,12 +379,12 @@ msgstr "%s: l'option -- %c requiert un paramtre.\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option `-W %s' est ambigu.\n"
+msgstr "%s: l'option -W %s est ambigu.\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option `-W %s' ne permet pas de paramtre.\n"
+msgstr "%s: l'option -W %s ne permet pas de paramtre.\n"
#. Get translations for open and closing quotation marks.
#.
@@ -447,20 +450,16 @@ msgstr "'"
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Slection de l'EXP_RGULIRE et interprtation:\n"
-#~ msgid ""
-#~ " -E, --extended-regexp PATTERN is an extended regular expression\n"
-#~ msgstr ""
-#~ " -E, --extended-regexp PATRON est une expression rgulire tendue\n"
+#~ msgid " -E, --extended-regexp PATTERN is an extended regular expression\n"
+#~ msgstr " -E, --extended-regexp PATRON est une expression rgulire tendue\n"
-#~ msgid ""
-#~ " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
+#~ msgid " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
#~ msgstr ""
#~ " -F, --fixed-strings PATRON est une chane de longueur fixe\n"
#~ " spare par des sauts de ligne\n"
#~ msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
-#~ msgstr ""
-#~ " -G, --basic-regexp PATRON est une expression rgulire de base\n"
+#~ msgstr " -G, --basic-regexp PATRON est une expression rgulire de base\n"
#~ msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
#~ msgstr ""
@@ -473,14 +472,12 @@ msgstr "'"
#~ msgid " -i, --ignore-case ignore case distinctions\n"
#~ msgstr " -i, --ignore-case ignorer la distinction de la casse\n"
-#~ msgid ""
-#~ " -w, --word-regexp force PATTERN to match only whole words\n"
+#~ msgid " -w, --word-regexp force PATTERN to match only whole words\n"
#~ msgstr ""
#~ " -w, --word-regexp forcer le PATRON tablir des\n"
#~ " concordances que pour des mots complets\n"
-#~ msgid ""
-#~ " -x, --line-regexp force PATTERN to match only whole lines\n"
+#~ msgid " -x, --line-regexp force PATTERN to match only whole lines\n"
#~ msgstr ""
#~ " -x, --line-regexp forcer le PATRON tablir des\n"
#~ " concordances que pour des lignes entires\n"
@@ -492,12 +489,10 @@ msgstr "'"
#~ msgstr " -s, --no-messages supprimer les messages d'erreur\n"
#~ msgid " -v, --revert-match select non-matching lines\n"
-#~ msgstr ""
-#~ " -v, --revert-match slectionner les lignes sans concordance\n"
+#~ msgstr " -v, --revert-match slectionner les lignes sans concordance\n"
#~ msgid " -V, --version print version information and exit\n"
-#~ msgstr ""
-#~ " -V, --version afficher le nom et la version du logiciel\n"
+#~ msgstr " -V, --version afficher le nom et la version du logiciel\n"
#~ msgid " --help display this help and exit\n"
#~ msgstr " --help afficher l'aide et quitter\n"
@@ -505,8 +500,7 @@ msgstr "'"
#~ msgid "Output control:\n"
#~ msgstr "Contrle de sortie:\n"
-#~ msgid ""
-#~ " -b, --byte-offset print the byte offset with output lines\n"
+#~ msgid " -b, --byte-offset print the byte offset with output lines\n"
#~ msgstr ""
#~ " -b, --byte-offset afficher les adresses relatives avec\n"
#~ " les lignes traites\n"
@@ -521,8 +515,7 @@ msgstr "'"
#~ " -H, --with-filename afficher le nom de fichier pour\n"
#~ " chaque concordance\n"
-#~ msgid ""
-#~ " -h, --no-filename suppress the prefixing filename on ouput\n"
+#~ msgid " -h, --no-filename suppress the prefixing filename on ouput\n"
#~ msgstr ""
#~ " -h, --no-filename supprimer le prfixe du nom de fichier\n"
#~ " sur la sortie\n"
@@ -530,20 +523,17 @@ msgstr "'"
#~ msgid " -q, --quiet, --silent suppress all normal output\n"
#~ msgstr " -q, --quiet, --silent supprimer tout affichage en sortie\n"
-#~ msgid ""
-#~ " -L, --files-without-match only print FILE names containing no match\n"
+#~ msgid " -L, --files-without-match only print FILE names containing no match\n"
#~ msgstr ""
#~ " -L, --files-without-match afficher seulement les noms des fichiers\n"
#~ " ne contenant pas de concordance\n"
-#~ msgid ""
-#~ " -l, --files-with-matches only print FILE names containing matches\n"
+#~ msgid " -l, --files-with-matches only print FILE names containing matches\n"
#~ msgstr ""
#~ " -l, --files-with-matches afficher seulement les noms des fichiers\n"
#~ " contenant des concordances\n"
-#~ msgid ""
-#~ " -c, --count only print a count of matching lines per FILE\n"
+#~ msgid " -c, --count only print a count of matching lines per FILE\n"
#~ msgstr ""
#~ " -c, --count afficher seulement le dcompte des lignes\n"
#~ " concordantes par fichier\n"
@@ -552,8 +542,7 @@ msgstr "'"
#~ msgstr "Contrle du contexte:\n"
#~ msgid " -B, --before-context=NUM print NUM lines of leading context\n"
-#~ msgstr ""
-#~ " -B, --before-context=N imprimer N lignes du contexte d'en-tte\n"
+#~ msgstr " -B, --before-context=N imprimer N lignes du contexte d'en-tte\n"
#~ msgid " -A, --after-context=NUM print NUM lines of trailing context\n"
#~ msgstr " -A, --after-context=N imprimer N lignes du contexte finale\n"
@@ -565,23 +554,18 @@ msgstr "'"
#~ msgstr " -C, --context identique -2\n"
#~ msgid " -U, --binary do not strip CR characters at EOL\n"
-#~ msgstr ""
-#~ " -U, --binary ne pas enlever les caractres CR sur les fins de "
-#~ "lignes\n"
+#~ msgstr " -U, --binary ne pas enlever les caractres CR sur les fins de lignes\n"
-#~ msgid ""
-#~ " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
+#~ msgid " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
#~ msgstr ""
#~ " -u, --unix-byte-offsets afficher les adresses relatives comme si\n"
#~ " aucun CR n'tait prsent\n"
-#~ msgid ""
-#~ "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
+#~ msgid "There should be one and only one PATTERN, `-e PATTERN' or `-f FILE'.\n"
#~ msgstr "Il ne devrait y avoir qu'un seul PATRON, -e PATRON ou -f FICHIER.\n"
#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr ""
-#~ "Si appel via egrep, les options -E et `fgrep' pour -F sont implicites.\n"
+#~ msgstr "Si appel via egrep, les options -E et `fgrep' pour -F sont implicites.\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
#~ msgstr ""
diff --git a/po/gl.po b/po/gl.po
index d6b49113..8ca37bf6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-06-19 11:52+02:00\n"
+"Project-Id-Version: grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-12 15:58+0100\n"
"Last-Translator: Jacobo Tarro Barreiro <jtarrio@iname.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memoria esgotada"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ sen emparellar"
@@ -40,73 +37,72 @@ msgstr "conta de repeticins sen rematar"
msgid "malformed repeat count"
msgstr "conta de repeticins mal formulada"
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "( sen emparellar"
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Sintaxe sen especificar"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr ") sen emparellar"
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "memoria esgotada"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memoria esgotada"
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "argumento de lonxitude do contexto non vlido"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "a entrada longa de mis para contala"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "escribindo na sada"
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Arquivo binario %s aparicins\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entrada estndar)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "aviso: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "ciclo de directorios recursivo"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Emprego: %s [OPCIN]... PATRN [FICHEIRO]...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Escriba `%s --help' para mis informacin.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Emprego: %s [OPCIN]... PATRN [FICHEIRO] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Seleccin e interpretacin de expresins regulares:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -127,12 +123,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp o PATRN unha expresin regular extendida\n"
-" -F, --fixed-strings o PATRN un conxunto de cadeas en distintas "
-"lias\n"
+" -F, --fixed-strings o PATRN un conxunto de cadeas en distintas lias\n"
" -G, --basic-regexp o PATRN unha expresin regular bsica\n"
" -P, --perl-regexp o PATRN unha expresin regular de Perl\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -143,14 +138,12 @@ msgid ""
msgstr ""
" -e, --regexp=PATRN usa o PATRN coma unha expresin regular\n"
" -f, --file=FICHEIRO obtn o PATRN no FICHEIRO\n"
-" -i, --ignore-case ignora a distincin entre maisculas e "
-"minsculas\n"
-" -w, --word-regexp obliga PATRON a encaixar con palabras "
-"completas\n"
+" -i, --ignore-case ignora a distincin entre maisculas e minsculas\n"
+" -w, --word-regexp obliga PATRON a encaixar con palabras completas\n"
" -x, --line-regexp obliga PATRON a encaixar con lias completas\n"
" -z, --null-data as lias de datos rematan nun bit 0\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,8 +161,7 @@ msgstr ""
" --help amosa esta axuda e sae\n"
" --mmap emprega entrada mapeada en memoria se se pode\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -179,6 +171,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -186,11 +180,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -199,12 +194,13 @@ msgstr ""
"\n"
"Control de sada:\n"
" -m, --max-count=NM parar tras NM aparicins\n"
-" -b, --byte-offset amosa o desprazamento do byte coas lias de "
-"sada\n"
+" -b, --byte-offset amosa o desprazamento do byte coas lias de sada\n"
" -n, --line-number amosa o numero de lia coas lias de sada\n"
" --line-buffered baleira-lo buffer de sada con cada lia\n"
" -H, --with-filename amosa o nome do ficheiro de cada aparicin\n"
" -h, --no-filename suprime o prefixo de nome de ficheiro na sada\n"
+" --label=ETIQUETA amosa-la ETIQUETA coma o nome da entrada estndar\n"
+" -o, --only-matching amosar s a parte da lia que encaixa co PATRN\n"
" -q, --quiet, --silent suprime toda a sada normal\n"
" --binary-files=TIPO supoer que os ficheiros binarios son TIPO\n"
" TIPO 'binary', 'text' ou 'without-match'\n"
@@ -214,21 +210,19 @@ msgstr ""
" -d, --directories=ACCION como trata-los directorios\n"
" ACCION 'read', 'recurse', ou 'skip'.\n"
" ('ler', 'ascender recursivamente', ou 'omitir')\n"
+" -D, --devices=ACCIN como trata-los dispositivos, FIFOs e sockets\n"
+" ACCIN 'read' ou 'skip' ('ler' ou 'omitir')\n"
" -R, -r, --recursive equivalente a --directories=recurse.\n"
-" --include=PATRN hanse examina-los ficheiros que encaixen no "
-"PATRN\n"
-" --exclude=PATRN hanse omiti-los ficheiros que encaixen no "
-"PATRN\n"
-" --exclude-from=FICH hanse omiti-los ficheiros que encaixen nos "
-"patrns\n"
+" --include=PATRN hanse examina-los ficheiros que encaixen no PATRN\n"
+" --exclude=PATRN hanse omiti-los ficheiros que encaixen no PATRN\n"
+" --exclude-from=FICH hanse omiti-los ficheiros que encaixen nos patrns\n"
" armacenados no FICHeiro\n"
" -L, --files-without-match s amosa os FICHEIROS sen aparicins\n"
" -l, --files-with-matches s amosa os FICHEIROS con aparicins\n"
-" -c, --count s amosa o nm. de lias coincidentes por "
-"FICHEIRO\n"
+" -c, --count s amosa o nm. de lias coincidentes por FICHEIRO\n"
" -Z, --null producir un byte 0 tralo nome do FICHEIRO\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -236,7 +230,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -251,20 +247,20 @@ msgstr ""
" -A, --after-context=NUM amosa NUM lias de contexto posterior\n"
" -C, --context=NUM amosa NUM lias de contexto na sada\n"
" -NUM o mesmo que --context=NUM\n"
-" --color, --colour empregar markadores para distingui-la cadea\n"
-" coincidente\n"
-" -U, --binary non elimina os caracteres CR na fin de lia "
-"(MSDOS)\n"
+" --color[=CANDO],\n"
+" --colour[=CANDO] empregar marcadores para distingui-la cadea\n"
+" coincidente. CANDO pode ser `always', `never' ou\n"
+" `auto' (`sempre', `nunca' ou `auto').\n"
+" -U, --binary non elimina os caracteres CR na fin de lia (MSDOS)\n"
" -u, --unix-byte-offsets amosa-los desprazamentos coma se os CR non\n"
" estiveran a (MSDOS)\n"
"\n"
"`egrep' significa `grep -E'. `fgrep' significa `grep -F'.\n"
"Se non se indica un FICHEIRO, ou cando o FICHEIRO -, lese da entrada\n"
-"estndar. Se se dan menos de dous FICHEIROs, suponse -h. O estado de sada "
-"\n"
+"estndar. Se se dan menos de dous FICHEIROs, suponse -h. O estado de sada \n"
"0 se hai aparicins, 1 se non hai, e 2 se o que hai son problemas.\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -273,40 +269,42 @@ msgstr ""
"Informe dos erros no programa a <bug-gnu-utils@gnu.org>.\n"
"Informe dos erros na traduccin a <proxecto@trasno.net>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "especificronse patrns conflictivos"
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "mtodo de dispositivos descoecido"
+
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mtodo de directorios descoecido"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "valor mximo non vlido"
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo de ficheiros binarios descoecido"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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 ""
-"Isto software libre; vexa o cdigo funte polas condicins de copia. NON "
-"HAI\n"
-"garanta; nin sequera de COMERCIABILIDADE ou APTITUDE PARA UN FIN "
-"PARTICULAR.\n"
+"Isto software libre; vexa o cdigo funte polas condicins de copia. NON HAI\n"
+"garanta; nin sequera de COMERCIABILIDADE ou APTITUDE PARA UN FIN PARTICULAR.\n"
#: src/search.c:606
msgid "The -P option is not supported"
diff --git a/po/hr.po b/po/hr.po
index 8f618c0a..066ba4bd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.2f\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1999-07-15 12:34+0200\n"
"Last-Translator: Matej Vela <mvela@public.srce.hr>\n"
"Language-Team: Croatian <hr-translation@bagan.srce.hr>\n"
@@ -13,132 +13,214 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "Memorija iscrpljena"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "[ bez para"
-
-#: src/dfa.c:741
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "\\ escape nedovren"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "broj ponavljanja nedovren"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "broj ponavljanja neispravan"
-#: src/dfa.c:1239
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+msgid "Unbalanced ["
+msgstr "[ bez para"
+
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "( bez para"
-#: src/dfa.c:1364
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr "Nije zadana sintaksa"
-#: src/dfa.c:1372
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr ") bez para"
-#: src/dfa.c:2942
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "ponestalo memorije"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: src/getopt.c:628
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcija `%s' je dvosmislena\n"
+
+#: src/getopt.c:652
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcija `--%s' ne doputa argument\n"
+
+#: src/getopt.c:657
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcija `%c%s' ne doputa argument\n"
+
+#: src/getopt.c:674 src/getopt.c:847
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcija `%s' zahtijeva argument\n"
+
+#. --option
+#: src/getopt.c:703
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opcija `--%s' neprepoznata\n"
+
+#. +option or -option
+#: src/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opcija `%c%s' neprepoznata\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:733
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: neispravna opcija -- %c\n"
+
+#: src/getopt.c:736
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: neispravna opcija -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:766 src/getopt.c:896
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcija zahtijeva argument -- %c\n"
+
+#: src/getopt.c:813
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcija `-W %s' je dvosmislena\n"
+
+#: src/getopt.c:831
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opcija `-W %s' ne doputa argument\n"
+
+#: src/getopt1.c:132
+#, c-format
+msgid "option %s"
+msgstr "opcija %s"
+
+#: src/getopt1.c:134
+#, c-format
+msgid " with arg %s"
+msgstr " s argumentom %s"
+
+#: src/getopt1.c:149
+msgid "digits occur in two different argv-elements.\n"
+msgstr "znamenke se pojavljuju u dva razliita elementa argv\n"
+
+#: src/getopt1.c:151
+#, c-format
+msgid "option %c\n"
+msgstr "opcija %c\n"
+
+#: src/getopt1.c:155
+msgid "option a\n"
+msgstr "opcija a\n"
+
+#: src/getopt1.c:159
+msgid "option b\n"
+msgstr "opcija b\n"
+
+#: src/getopt1.c:163
+#, c-format
+msgid "option c with value `%s'\n"
+msgstr "opcija c s vrijednou `%s'\n"
+
+#: src/getopt1.c:167
+#, c-format
+msgid "option d with value `%s'\n"
+msgstr "opcija d s vrijednou `%s'\n"
+
+#: src/getopt1.c:174
+#, c-format
+msgid "?? getopt returned character code 0%o ??\n"
+msgstr "?? getopt vratio znak 0%o ??\n"
+
+#: src/getopt1.c:180
+msgid "non-option ARGV-elements: "
+msgstr "elementi ARGV-a koji nisu opcije: "
+
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/kwset.c:190
msgid "memory exhausted"
msgstr "memorija iscrpljena"
-#: src/grep.c:191
-msgid "invalid context length argument"
-msgstr "neispravan argument duljine konteksta"
-
-#: src/grep.c:458
-msgid "input is too large to count"
-msgstr ""
+#: src/grep.c:372 src/grep.c:843
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: upozorenje: %s: %s\n"
-#: src/grep.c:531
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr "piem izlaz"
-#: src/grep.c:804
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarna datoteka %s se podudara\n"
-#: src/grep.c:818
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(standardni ulaz)"
-#: src/grep.c:923
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
-msgstr "%s: upozorenje: %s: %s\n"
-
-#: src/grep.c:924
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr "petlja u rekurziji direktorijima"
-#: src/grep.c:972
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Koritenje: %s [OPCIJA]... UZORAK [DATOTEKA]...\n"
-#: src/grep.c:974
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Za vie informacija pokrenite `%s --help'.\n"
-#: src/grep.c:979
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Koritenje: %s [OPCIJA]... UZORAK [DATOTEKA] ...\n"
-#: src/grep.c:980
-#, c-format
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
-"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:985
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
-msgstr ""
-
-#: src/grep.c:990
-#, fuzzy
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
"Trai UZORAK u svakoj DATOTECI ili standardnom ulazu.\n"
"\n"
"Odabir i tumaenje regularnih izraza:\n"
" -E, --extended-regexp UZORAK je proireni regularni izraz\n"
-" -F, --fixed-regexp UZORAK je fiksni string razdvojen novim "
-"redovima\n"
+" -F, --fixed-regexp UZORAK je fiksni string razdvojen novim redovima\n"
" -G, --basic-regexp UZORAK je jednostavni regularni izraz\n"
" -e, --regexp=UZORAK koristi UZORAK kao regularni izraz\n"
" -f, --file=DATOTEKA UZORAK pribavi iz DATOTEKE\n"
@@ -146,16 +228,14 @@ msgstr ""
" -w, --word-regexp UZORAK moe odgovarati samo potpunim rijeima\n"
" -x, --line-regexp UZORAK moe odgovarati samo potpunim redovima\n"
-#: src/grep.c:997
-#, fuzzy
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
-" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Sporedno:\n"
@@ -164,33 +244,22 @@ msgstr ""
" -V, --version ispii informacije o verziji i zavri\n"
" --help prikai ovu pomo i zavri\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
-" -a, --text equivalent to --binary-files=text\n"
-" -I equivalent to --binary-files=without-match\n"
+" -a, --text do not suppress binary output\n"
" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Kontrola izlaza:\n"
@@ -205,26 +274,24 @@ msgstr ""
" -r, --recursive isto to i --directories=recurse.\n"
" -L, --files-without-match ispisuj samo imena DATOTEKA bez podudaranja\n"
" -l, --files-with-matches ispisuj samo imena DATOTEKA s podudaranjima\n"
-" -c, --count ispisuj samo broj podudarajuih redova po "
-"datoteci\n"
+" -c, --count ispisuj samo broj podudarajuih redova po datoteci\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overriden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
-"and 2 if trouble.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
+"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
"\n"
"Kontrola konteksta:\n"
@@ -242,43 +309,36 @@ msgstr ""
"podudaranja, uz 1 ako nema. Zavri uz 2 ako bude greaka u sintaksi ili u\n"
"sustavu.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Bugove prijavljujte na <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:950
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nBugove prijavljujte na <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
-#, fuzzy
-msgid "conflicting matchers specified"
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+msgid "invalid context length argument"
+msgstr "neispravan argument duljine konteksta"
+
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "moete navesti samo jedno od -E, -F ili -G"
+
+#: src/grep.c:1145
+msgid "matcher already specified"
msgstr "izraz ve zadan"
-#: src/grep.c:1347
+#: src/grep.c:1166
msgid "unknown directories method"
msgstr "nepoznata metoda za direktorije"
-#: src/grep.c:1414
-#, fuzzy
-msgid "invalid max count"
-msgstr "broj ponavljanja nedovren"
-
-#: src/grep.c:1464
-msgid "unknown binary-files type"
-msgstr ""
-
-#: src/grep.c:1535
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+#: src/grep.c:1254
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1256
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"
@@ -286,131 +346,6 @@ msgstr ""
"Ovo je slobodan program; za uvjete kopiranja pogledajte izvorni kod. NEMA\n"
"jamstva; ak ni za TRGOVINSKU PRIKLADNOST ili ODGOVARANJE ODREENOJ SVRSI.\n"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcija `%s' je dvosmislena\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcija `--%s' ne doputa argument\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija `%c%s' ne doputa argument\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcija `%s' zahtijeva argument\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opcija `--%s' neprepoznata\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opcija `%c%s' neprepoznata\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neispravna opcija -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: neispravna opcija -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcija zahtijeva argument -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcija `-W %s' je dvosmislena\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija `-W %s' ne doputa argument\n"
-
-#. 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, 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.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "opcija %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " s argumentom %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "znamenke se pojavljuju u dva razliita elementa argv\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "opcija %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "opcija a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "opcija b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "opcija c s vrijednou `%s'\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "opcija d s vrijednou `%s'\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt vratio znak 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "elementi ARGV-a koji nisu opcije: "
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "moete navesti samo jedno od -E, -F ili -G"
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "memorija iscrpljena\n"
+#: src/obstack.c:467
+msgid "memory exhausted\n"
+msgstr "memorija iscrpljena\n"
diff --git a/po/id.po b/po/id.po
index 60d8068a..8975a380 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.3f.id.po\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 1999-10-05 22:33-0400\n"
"PO-Revision-Date: 1999-10-29 16:04+07:00\n"
"Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
"Language-Team: Indonesian <id@li.org>\n"
@@ -13,18 +13,11 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:898
msgid "Memory exhausted"
msgstr "Memori habis"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "[ tidak seimbang"
-
-#: src/dfa.c:741
+#: src/dfa.c:457
msgid "Unfinished \\ escape"
msgstr "escape \\\\ tidak selesai"
@@ -32,85 +25,185 @@ msgstr "escape \\\\ tidak selesai"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:590 src/dfa.c:596 src/dfa.c:606 src/dfa.c:614 src/dfa.c:629
msgid "unfinished repeat count"
msgstr "perulangan count tidak selesai"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:603 src/dfa.c:620 src/dfa.c:628 src/dfa.c:632
msgid "malformed repeat count"
msgstr "perulangan count salah bentuk"
-#: src/dfa.c:1239
+#: src/dfa.c:697 src/dfa.c:700 src/dfa.c:727 src/dfa.c:731 src/dfa.c:732
+#: src/dfa.c:735 src/dfa.c:748 src/dfa.c:749
+msgid "Unbalanced ["
+msgstr "[ tidak seimbang"
+
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "( tidak seimbang"
-#: src/dfa.c:1364
+#: src/dfa.c:1007
msgid "No syntax specified"
msgstr "Tidak ada syntax dispesifikasikan"
-#: src/dfa.c:1372
+#: src/dfa.c:1015
msgid "Unbalanced )"
msgstr ") tidak seimbang"
-#: src/dfa.c:2942
+#: src/dfa.c:2036
msgid "out of memory"
msgstr "memori habis"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: src/getopt.c:628
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opsi `%s' rancu\n"
+
+#: src/getopt.c:652
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opsi `--%s' tidak mengijinkan argumen\n"
+
+#: src/getopt.c:657
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opsi `%c%s' tidak mengijinkan argumen\n"
+
+#: src/getopt.c:674 src/getopt.c:847
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
+
+#. --option
+#: src/getopt.c:703
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opsi tidak dikenal `--%s'\n"
+
+#. +option or -option
+#: src/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opsi tidak dikenal `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:733
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opsi ilegal -- %c\n"
+
+#: src/getopt.c:736
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opsi tidak valid -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:766 src/getopt.c:896
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
+
+#: src/getopt.c:813
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opsi `-W %s' rancu\n"
+
+#: src/getopt.c:831
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n"
+
+#: src/getopt1.c:132
+#, c-format
+msgid "option %s"
+msgstr "opsi %s"
+
+#: src/getopt1.c:134
+#, c-format
+msgid " with arg %s"
+msgstr " dengan arg %s"
+
+#: src/getopt1.c:149
+msgid "digits occur in two different argv-elements.\n"
+msgstr "digit muncul dalam dua argv-elemen yang berbeda.\n"
+
+#: src/getopt1.c:151
+#, c-format
+msgid "option %c\n"
+msgstr "opsi %c\n"
+
+#: src/getopt1.c:155
+msgid "option a\n"
+msgstr "opsi a\n"
+
+#: src/getopt1.c:159
+msgid "option b\n"
+msgstr "opsi b\n"
+
+#: src/getopt1.c:163
+#, c-format
+msgid "option c with value `%s'\n"
+msgstr "opsi c dengan nilai `%s'\n"
+
+#: src/getopt1.c:167
+#, c-format
+msgid "option d with value `%s'\n"
+msgstr "opsi d dengan nilai `%s'\n"
+
+#: src/getopt1.c:174
+#, c-format
+msgid "?? getopt returned character code 0%o ??\n"
+msgstr "?? getopt mengembalikan kode karakter 0%o ??\n"
+
+#: src/getopt1.c:180
+msgid "non-option ARGV-elements: "
+msgstr "elemen-ARGV bukan opsi: "
+
+#: src/grep.c:179 src/grep.c:196 src/grep.c:292 src/grep.c:387 src/kwset.c:184
+#: src/kwset.c:190
msgid "memory exhausted"
msgstr "memori habis"
-#: src/grep.c:191
-msgid "invalid context length argument"
-msgstr "argumen panjang konteks tidak valid"
-
-#: src/grep.c:458
-msgid "input is too large to count"
-msgstr ""
+#: src/grep.c:418 src/grep.c:883
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: peringatan: %s: %s\n"
-#: src/grep.c:531
+#: src/grep.c:543 src/grep.c:1429
msgid "writing output"
msgstr "menulis output"
-#: src/grep.c:804
+#: src/grep.c:775
#, c-format
msgid "Binary file %s matches\n"
msgstr "File biner %s cocok\n"
-#: src/grep.c:818
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(input standar)"
-#: src/grep.c:923
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
-msgstr "%s: peringatan: %s: %s\n"
-
-#: src/grep.c:924
+#: src/grep.c:884
msgid "recursive directory loop"
msgstr "perulangan direktori rekursif"
-#: src/grep.c:972
+#: src/grep.c:935
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Pemakaian: %s [OPSI]... POLA [FILE]...\n"
-#: src/grep.c:974
+#: src/grep.c:936
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
-#: src/grep.c:979
+#: src/grep.c:940
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
-#: src/grep.c:980
-#, fuzzy, c-format
+#: src/grep.c:941
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
-"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
@@ -118,20 +211,17 @@ msgstr ""
"\n"
"Seleksi dan interpretasi regexp:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:945
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp POLA adalah ekspresi reguler ekstended\n"
-" -F, --fixed-regexp POLA adalah string tetap yang dipisah oleh "
-"newline\n"
+" -F, --fixed-regexp POLA adalah string tetap yang dipisah oleh newline\n"
" -G, --basic-regexp POLA adalah ekspresi reguler dasar\n"
-#: src/grep.c:990
+#: src/grep.c:949
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -148,8 +238,7 @@ msgstr ""
" -z, --null-data baris data berakhir dalam 0 byte, bukan newline\n"
"\n"
-#: src/grep.c:997
-#, fuzzy
+#: src/grep.c:956
msgid ""
"\n"
"Miscellaneous:\n"
@@ -157,7 +246,6 @@ msgid ""
" -v, --invert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
-" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
"Lain-lain:\n"
@@ -166,29 +254,19 @@ msgstr ""
" -V, --version tampilkan informasi versi dan keluar\n"
" --help tampilkan bantuan ini dan keluar\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:963
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
-" -a, --text equivalent to --binary-files=text\n"
-" -I equivalent to --binary-files=without-match\n"
+" -a, --text do not suppress binary output\n"
" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -205,29 +283,27 @@ msgstr ""
" -d, --directories=AKSI bagaimana menangani direktori\n"
" AKSI adalah 'read', 'recurse', atau 'skip'.\n"
" -r, --recursive ekivalen dengan --directories=recurse.\n"
-" -L, --files-without-match hanya mencetak nama FILE yang tidak ada "
-"kecocokan\n"
+" -L, --files-without-match hanya mencetak nama FILE yang tidak ada kecocokan\n"
" -l, --files-with-match hanya mencetak nama FILE yang ada kecocokan\n"
" -c, --count hanya mencetak jumlah baris yang cocok per FILE\n"
" -Z, --null mencetak byte 0 setelah nama FILE\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:979
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overriden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
-"and 2 if trouble.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
+"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
"\n"
"Kendali Konteks:\n"
@@ -237,52 +313,39 @@ msgstr ""
" kecuali di-override dengan -A atau -B\n"
" -NUM sama seperti --context=NUM\n"
" -U, --binary jangan hapus karakter CR di EOL (MSDOS)\n"
-" -u, --unix-byte-offsets laporkan offset seperti bila CR tidak ada "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets laporkan offset seperti bila CR tidak ada (MSDOS)\n"
"\n"
"`egrep' berarti `grep -E'. `fgrep' berarti `grep -F'.\n"
-"Dengan tanpa FILE, atau ketika FILE adalah -, baca input standar. Jika "
-"diberi \n"
-"kurang dari dua file, asumsikan -h. Keluar dengan 0 jika cocok, dengan 1 "
-"jika\n"
+"Dengan tanpa FILE, atau ketika FILE adalah -, baca input standar. Jika diberi \n"
+"kurang dari dua file, asumsikan -h. Keluar dengan 0 jika cocok, dengan 1 jika\n"
"tidak. Keluar dengan 2 jika terjadi syntax atau system error.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:994
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nLaporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1005
msgid "conflicting matchers specified"
msgstr "dispesifikasikan matcher yang konflik"
-#: src/grep.c:1347
+#: src/grep.c:1204 src/grep.c:1211 src/grep.c:1220
+msgid "invalid context length argument"
+msgstr "argumen panjang konteks tidak valid"
+
+#: src/grep.c:1271
msgid "unknown directories method"
msgstr "metode direktori tidak dikenal"
-#: src/grep.c:1414
-#, fuzzy
-msgid "invalid max count"
-msgstr "perulangan count tidak selesai"
-
-#: src/grep.c:1464
-msgid "unknown binary-files type"
-msgstr ""
-
-#: src/grep.c:1535
+#: src/grep.c:1366
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+#: src/grep.c:1368
+msgid "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
msgstr "Hak Cipta (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1370
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"
@@ -290,128 +353,6 @@ msgstr ""
"Ini adalah free software; lihat sumber untuk syarat penyalinan. Tidak ada\n"
"jaminan; sekalipun untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opsi `%s' rancu\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opsi `--%s' tidak mengijinkan argumen\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opsi `%c%s' tidak mengijinkan argumen\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opsi tidak dikenal `--%s'\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opsi tidak dikenal `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opsi ilegal -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opsi tidak valid -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opsi `-W %s' rancu\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n"
-
-#. 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, 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.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "opsi %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " dengan arg %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "digit muncul dalam dua argv-elemen yang berbeda.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "opsi %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "opsi a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "opsi b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "opsi c dengan nilai `%s'\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "opsi d dengan nilai `%s'\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt mengembalikan kode karakter 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "elemen-ARGV bukan opsi: "
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "memori habis\n"
+#: src/obstack.c:467
+msgid "memory exhausted\n"
+msgstr "memori habis\n"
diff --git a/po/it.po b/po/it.po
index ad63d14f..02e7e095 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,11 +4,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-08-10 13:46+0200\n"
+"Project-Id-Version: grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-08 00:20+0100\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
-"Language-Team: Italian <it@li.org>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memoria esaurita"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ non bilanciata"
@@ -40,73 +37,72 @@ msgstr "numero di ripetizioni incompleto"
msgid "malformed repeat count"
msgstr "numero di ripetizioni malformato"
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "( non bilanciata"
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Nessuna sintassi specificata"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr ") non bilanciata"
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "memoria esaurita"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memoria esaurita"
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "argomento della lunghezza del contesto non valido"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "l'input troppo grande per essere contato"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "scrittura dell'output"
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Il file binario %s corrisponde\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standard input)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "attenzione: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "loop ricorsivo di directory"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [OPZIONE]... MODELLO [FILE]...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare `%s --help' per ulteriori informazioni.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uso: %s [OPZIONE]... MODELLO [FILE] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Selezione ed interpretazione delle regexp:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,7 +128,7 @@ msgstr ""
" -G, --basic-regexp il MODELLO una regular expression semplice\n"
" -P, --perl-regexp il MODELLO una regular expression del perl\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -144,14 +140,11 @@ msgstr ""
" -e, --regexp=MODELLO usa MODELLO come espressione regolare\n"
" -f, --file=FILE prende il MODELLO dal FILE\n"
" -i, --ignore-case ignora la distinzione tra maiuscole e minuscole\n"
-" -w, --word-regexp forza MODELLO a corrispondere solo a parole "
-"intere\n"
-" -x, --line-regexp forza MODELLO a corrispondere solo a righe "
-"intere\n"
-" -z, --null-data una riga di dati termina con \\0 invece che "
-"newline\n"
-
-#: src/grep.c:997
+" -w, --word-regexp forza MODELLO a corrispondere solo a parole intere\n"
+" -x, --line-regexp forza MODELLO a corrispondere solo a righe intere\n"
+" -z, --null-data una riga di dati termina con \\0 invece che newline\n"
+
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -169,8 +162,7 @@ msgstr ""
" --help mostra questo aiuto ed esce\n"
" --mmap se possibile mappa in memoria l'input\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -180,6 +172,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -187,11 +181,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -201,32 +196,32 @@ msgstr ""
"Controllo dell'output:\n"
" -m, --max-count=NUM si ferma dopo NUM corrispondenze\n"
" -b, --byte-offset stampa l'offset del byte con le righe di output\n"
-" -n, --line-number stampa il numero della riga con le righe di "
-"output\n"
+" -n, --line-number stampa il numero della riga con le righe di output\n"
" --line-buffered fa il flush dell'output dopo ogni riga\n"
" -H, --with-filename stampa il nome del file per ogni corrispondenza\n"
" -h, --no-filename elimina il nome del file davanti all'output\n"
+" --label=LABEL stampa LABEL al posto del nome del file per stdin\n"
+" -o, --only-matching mostra solo la parte della riga corrispondente al\n"
+" MODELLO\n"
" -q, --quiet, --silent elimina tutto il normale output\n"
-" --binary-files=TIPO suppone che i file binari siano di TIPO "
-"'binary',\n"
+" --binary-files=TIPO suppone che i file binari siano di TIPO 'binary',\n"
" 'text' oppure 'without-match'.\n"
" -a, --text equivalente a --binary-files=text\n"
" -I equivalente a --binary-files=without-match\n"
-" -d, --directories=AZIONE come gestire le directory: AZIONE 'read' "
-"(legge),\n"
+" -d, --directories=AZIONE come gestire le directory: AZIONE 'read' (legge),\n"
" 'recurse' (ricorsivo) o 'skip' (salta)\n"
+" -D, --devices=AZIONE come gestire device, FIFO e socket: AZIONE \n"
+" 'read' (legge) o 'skip' (salta) \n"
" -r, --recursive equivalente a --directories=recurse\n"
" --include=MODELLO esamina i file corrispondenti al MODELLO\n"
" --exclude=MODELLO salta i file corrispondenti al MODELLO\n"
" --exclude-from=FILE salta i file corrispondenti ai modelli nel FILE\n"
" -L, --files-without-match stampa solo i nomi dei FILE senza occorrenze\n"
-" -l, --files-with-matches stampa solo i nomi dei FILE contenenti "
-"occorrenze\n"
-" -c, --count stampa solo il conto delle righe occorrenti in ogni "
-"FILE\n"
+" -l, --files-with-matches stampa solo i nomi dei FILE contenenti occorrenze\n"
+" -c, --count stampa solo il conto delle righe occorrenti in ogni FILE\n"
" -Z, --null stampa il byte 0 dopo ogni nome di FILE\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -234,7 +229,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -249,19 +246,18 @@ msgstr ""
" -A, --after-context=NUM stampa NUM righe di contesto seguente\n"
" -C, --context=NUM stampa NUM righe di contesto dell'output\n"
" -NUM come --context=NUM\n"
-" --color, --colour usa i colori per distinguere la stringa "
-"corrispond.\n"
+" --color[=QUANDO]\n"
+" --colour[=QUANDO] usa i colori per distinguere la stringa corrispond.\n"
+" QUANDO pu essere 'always', 'never' o 'auto'.\n"
" -U, --binary non rimuove i caratteri CR all'EOL (MSDOS)\n"
-" -u, --unix-byte-offsets segnala gli offset come se non ci fossero CR "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets segnala gli offset come se non ci fossero CR (MSDOS)\n"
"\n"
-"`egrep' significa `grep -E'. `fgrep'significa `grep -F'.\n"
+"`egrep' significa `grep -E'. `fgrep' significa `grep -F'.\n"
"Se non c' un FILE, o il FILE -, legge lo standard input. Se sono stati\n"
-"specificati meno di due file presume -h. Esce con 0 se corrisponde, con 1 "
-"se\n"
+"specificati meno di due file presume -h. Esce con 0 se corrisponde, con 1 se\n"
"non corrisponde o con 2 se ci sono problemi.\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -269,32 +265,36 @@ msgstr ""
"\n"
"Segnalare i bug a <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "specificate corrispondenze in conflitto"
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "metodo per i dispositivi sconosciuto"
+
+#: src/grep.c:1430
msgid "unknown directories method"
-msgstr "metodo delle directory sconosciuto"
+msgstr "metodo per le directory sconosciuto"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "numero massimo non valido"
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo di file binario sconosciuto"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (grep GNU) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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"
@@ -302,8 +302,7 @@ 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"
"\n"
-"Questo software libero; si veda il sorgente per le condizioni di "
-"copiatura.\n"
+"Questo software libero; si veda il sorgente per le condizioni di copiatura.\n"
"NON c' garanzia; neppure di COMMERCIABILIT o IDONEIT AD UN PARTICOLARE\n"
"SCOPO.\n"
diff --git a/po/ja.po b/po/ja.po
index 928a8de3..4c7d5e88 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,7 @@
# Japanese messages for GNU grep
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# IIDA Yosiaki <iida@secom.ne.jp>, 1999-2000.
+# Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
+# IIDA Yosiaki <iida@gnu.org>, 1999, 2000, 2001.
+# This file is distributed under the same license as the GNU grep package.
# Contributed by
# Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>, 1997
# and taken over on 1999-09-24 by IIDA.
@@ -9,27 +10,28 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4f\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2000-02-16 21:05+09:00\n"
-"Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
+"Project-Id-Version: GNU grep 2.5e\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
+"PO-Revision-Date: 2002-02-08 22:15+0900\n"
+"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
+"Comments: This file is part of GNU grep.\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "꡼­ޤ"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
+#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
+#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
+#: src/dfa.c:1045 src/dfa.c:1046
msgid "Unbalanced ["
-msgstr "[פ礤ޤ"
+msgstr "[ 礤ޤ"
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "\\ פλƤޤ"
@@ -37,32 +39,32 @@ msgstr "\\ פλƤޤ"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "֤Ȥλޤ"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "֤Ȥ۾Ǥ"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
-msgstr "(פ礤ޤ"
+msgstr "( 礤ޤ"
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "ʸꤵƤޤ"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
-msgstr ")פ礤ޤ"
+msgstr ") 礤ޤ"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
-msgstr "꡼­ޤ"
+msgstr "꡼ʤʤޤ"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
+#: src/search.c:103 src/search.c:223 src/search.c:307
msgid "memory exhausted"
msgstr "꡼­ޤ"
@@ -70,48 +72,48 @@ msgstr "꡼­ޤ"
msgid "invalid context length argument"
msgstr "Կλְ꤬äƤޤ"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
-msgstr ""
+msgstr "Ϥ礭ƿޤ"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "Ϥν"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Хʥ꡼ե%sȰפޤ\n"
+msgstr "Хʥ꡼ե%sϰפޤ\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(ɸ)"
-#: src/grep.c:923
-#, fuzzy, c-format
+#: src/grep.c:931
+#, c-format
msgid "warning: %s: %s\n"
-msgstr "%s: ٹ: %s: %s\n"
+msgstr "ٹ: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "ǥ쥯ȥ꡼ƵŪ롼פ򤷤Ƥޤ"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "ˡ: %s [ץ]š ʸѥ [ե]š\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ܤ`%s --help'¹ԤƤ\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "ˡ: %s [ץ]š ʸѥ [ե] š\n"
+msgstr "ˡ: %s [ץ]š ѥ [ե] š\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -124,8 +126,7 @@ msgstr ""
"\n"
"ɽȲˡ:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,11 +134,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp ֥ѥפĥ줿ɽȤ\n"
-" -F, --fixed-regexp "
-"֥ѥפԤǶڤ줿ʸȤ\n"
+" -F, --fixed-strings ֥ѥפԤǶڤ줿ʸȤ\n"
" -G, --basic-regexp ֥ѥפŪɽȤ\n"
+" -P, --perl-regexp ֥ѥפPerlɽȤ\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,13 +148,13 @@ msgid ""
" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
" -e, --regexp=ѥ ɽ˻ѥȤ\n"
-" -f, --file=ե ѥե뤫ɤ\n"
+" -f, --file=ե ֥ѥפե뤫ɤ\n"
" -i, --ignore-case ʸ/ʸ̵뤹\n"
-" -w, --word-regexp ѥפñ(ññ)ǹԤʤ\n"
-" -x, --line-regexp ѥפ(ñ)ǹԤʤ\n"
+" -w, --word-regexp ֥ѥװפñ(ññ)ǹԤʤ\n"
+" -x, --line-regexp ֥ѥװפ(ñ)ǹԤʤ\n"
" -z, --null-data ϤԤǤʤ̥ͤΥХȤǶڤ\n"
-#: src/grep.c:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,14 +166,13 @@ msgid ""
msgstr ""
"\n"
"¾:\n"
-" -s, --no-messages 顼åϤ֤\n"
+" -s, --no-messages 顼å޻ߤ\n"
" -v, --invert-match פʤԤоݤˤ\n"
" -V --version СɸϤɽƽλ\n"
" --help ȤɸϤɽ\n"
" --mmap ⤷ǽʤ顢Ϥ꡼ޥåפ\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -190,10 +190,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --include=PATTERN files that match PATTERN will be examine\n"
+" --exclude=PATTERN files that match PATTERN will be skip.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skip.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -201,8 +200,10 @@ msgid ""
msgstr ""
"\n"
":\n"
+" -m, --max-count= ꤷײθ塢λ\n"
" -b, --byte-offset ưפФƤΥХȡեåȤɽ\n"
" -n, --line-number ưפФƤιԿɽ\n"
+" --line-buffered ԤȤ˽ϤݤФ\n"
" -H, --with-filename ưפФƤΥե̾ɽ\n"
" -h, --no-filename ե̾ɽʤ\n"
" -q, --quiet, --silent ̾νϤ򤹤٤޻ߤ\n"
@@ -210,16 +211,19 @@ msgstr ""
" textסwithout-matchפꡣ\n"
" -a, --text --binary-files=textƱ\n"
" -I --binary-files=without-matchƱ\n"
-" -d, --directories= ǥ쥯ȥ꡼ؤ'read'(ɹ)\n"
-" 'recurse'(Ƶ)'skip'(å)ꡣ\n"
-" -r, --recursive --directories=recurseƱ\n"
+" -d, --directories= ǥ쥯ȥ꡼ؤread(ɹ)\n"
+" recurse(Ƶ)skip(ά)\n"
+" -R, -r, --recursive --directories=recurseƱ\n"
+" --include=ѥ ѥȰפե򸡺\n"
+" --exclude=ѥ ѥȰפեά롣\n"
+" --exclude-from=ե ꤷեΡ֥ѥפ\n"
+" פեά롣\n"
" -L, --files-without-match פΤʤäե̾Τߤɽ\n"
" -l, --files-with-matches פե̾Τߤɽ\n"
-" -c, --count פԿΤߤɽ\n"
+" -c, --count ե뤴Ȥ˰פԿΤߤɽ\n"
" -Z, --null ե̾θˡ̥ͤΥХȤɽ\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -238,77 +242,68 @@ msgid ""
msgstr ""
"\n"
"ط:\n"
-" -B, --before-context= Ρֿ׹ԤϤ\n"
-" -A, --after-context= Ρֿ׹ԤϤ\n"
-" -C, --context[=Կ] Կ(ɸ2)ƤϤ\n"
-" -A-Bͥ٤㤤\n"
+" -B, --before-context= Ρֿ׹ԤϤ\n"
+" -A, --after-context= ׸Ρֿ׹ԤϤ\n"
+" -C, --context=Կ λԿƤϤ\n"
" -Կ --context=Կ Ʊ\n"
+" --color, --colour use markers to distinguish the matching string\n"
" -U, --binary EOLǤCRʸʤʤ(MS-DOS)\n"
" -u, --unix-byte-offsets CRʸʤΤȤƥեåȤ\n"
" Ϥ(MS-DOS)\n"
"\n"
-"`egrep'`grep -E'Ρ`fgrep'`grep -F'ΰ̣ˤʤޤ\n"
-"-G-E-FΤɤλʤȡ`egrep'ޥɤǤ-Eȡ\n"
-"`fgrep'ޥɤǤ-FȡʳǤ-GȲꤷޤ\n"
-"եλ꤬ʤäꡢե̾`-'ꤷꤹȡ\n"
-"ɸϤɤ߹ߤޤե뤬̤ξ硢-hȲꤷޤ\n"
+"egrepפϡgrep -EפΤȤǤfgrepפϡgrep -FפΤȤǤ\n"
+"֥եפλ꤬ʤäꡢ֥եפˡ-פꤷꤹȡ\n"
+"ɸϤɤ߹ߤޤ֥եפθĿ1ʲξ硢-hȲꤷޤ\n"
"⤷פ0ǡʤ1ǡ㳲2ǡλޤ\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Х <bug-gnu-utils@gnu.org> 𤷤Ƥ\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nХ <bug-gnu-utils@gnu.org> 𤷤Ƥ\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
-msgstr "ͤmatcherꤵƤޤ"
+msgstr "ꤷȹҤͤƤޤ"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
-msgstr "ǥ쥯ȥ꡼λ꤬Ǥ"
+msgstr "̤ΤΥǥ쥯ȥ꡼Ǥ"
-#: src/grep.c:1414
-#, fuzzy
+#: src/grep.c:1422
msgid "invalid max count"
-msgstr "֤Ȥλޤ"
+msgstr "ײְäƤޤ"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
-msgstr "Хʥ꡼եλ꤬Ǥ"
+msgstr "̤ΤΥХʥ꡼եηǤ"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) С %s\n"
+msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
-msgstr ""
+msgstr "-PץϥݡȤƤޤ"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
-msgstr ""
+msgstr "-P-zΥץȹ礻ϤǤޤ"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr ""
+msgstr "̤ΤΥƥࡦ顼Ǥ"
#: lib/getopt.c:675
#, c-format
@@ -383,10 +378,10 @@ msgstr "%s: ץ`-W %s'ϰȤޤ\n"
#. 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.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:265
msgid "`"
-msgstr ""
+msgstr ""
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
-msgstr ""
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 5645f77d..98cbfc22 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0f\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1997-09-03 11:19+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,369 +13,307 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "޸𸮰 ٴڳ"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "¦ ʴ ["
-
-#: src/dfa.c:741
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "ϰ \\ ̽"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "ϰ ݺ ȸ"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "߸ ־ ݺ ȸ"
-#: src/dfa.c:1239
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+msgid "Unbalanced ["
+msgstr "¦ ʴ ["
+
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "¦ ʴ ("
-#: src/dfa.c:1364
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr " ʾ"
-#: src/dfa.c:1372
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr "¦ ʴ )"
-#: src/dfa.c:2942
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "޸ "
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: src/getopt.c:628
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' ȣ ɼԴϴ\n"
+
+#: src/getopt.c:652
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' ɼ μ ʽϴ\n"
+
+#: src/getopt.c:657
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' ɼ μ ʽϴ\n"
+
+#: src/getopt.c:674 src/getopt.c:847
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' ɼ μ ʿմϴ\n"
+
+#. --option
+#: src/getopt.c:703
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ν ɼ `--%s'\n"
+
+#. +option or -option
+#: src/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ν ɼ `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:733
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ߸ ɼ -- %c\n"
+
+#: src/getopt.c:736
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ɼ -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:766 src/getopt.c:896
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ɼ μ ʿմϴ -- %c\n"
+
+#: src/getopt.c:813
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' ȣ ɼԴϴ\n"
+
+#: src/getopt.c:831
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' ɼ μ ʽϴ\n"
+
+#: src/getopt1.c:132
+#, c-format
+msgid "option %s"
+msgstr "%s ɼ"
+
+#: src/getopt1.c:134
+#, c-format
+msgid " with arg %s"
+msgstr " %s μ "
+
+#: src/getopt1.c:149
+msgid "digits occur in two different argv-elements.\n"
+msgstr "ڰ ٸ argv ҿ ߰ߵǾϴ.\n"
+
+#: src/getopt1.c:151
+#, c-format
+msgid "option %c\n"
+msgstr "%c ɼ\n"
+
+#: src/getopt1.c:155
+msgid "option a\n"
+msgstr "a ɼ\n"
+
+#: src/getopt1.c:159
+msgid "option b\n"
+msgstr "b ɼ\n"
+
+#: src/getopt1.c:163
+#, c-format
+msgid "option c with value `%s'\n"
+msgstr "`%s' c ɼ\n"
+
+#: src/getopt1.c:167
+#, c-format
+msgid "option d with value `%s'\n"
+msgstr "`%s' d ɼ\n"
+
+#: src/getopt1.c:174
+#, c-format
+msgid "?? getopt returned character code 0%o ??\n"
+msgstr "?? getopt ڵ 0%o ־ϴ ??\n"
+
+#: src/getopt1.c:180
+msgid "non-option ARGV-elements: "
+msgstr "ɼ ARGV : "
+
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/kwset.c:190
msgid "memory exhausted"
msgstr "޸𸮰 ٴڳ"
-#: src/grep.c:191
-msgid "invalid context length argument"
-msgstr ""
-
-#: src/grep.c:458
-msgid "input is too large to count"
-msgstr ""
+#: src/grep.c:372 src/grep.c:843
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: : %s: %s\n"
-#: src/grep.c:531
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr " ϰ ֽϴ"
-#: src/grep.c:804
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:818
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(ǥ Է)"
-#: src/grep.c:923
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
-msgstr "%s: : %s: %s\n"
-
-#: src/grep.c:924
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:972
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s [ɼ]... []...\n"
-#: src/grep.c:974
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " `%s --help' Ͻʽÿ.\n"
-#: src/grep.c:979
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s [ɼ]... [] ...\n"
-#: src/grep.c:980
-#, c-format
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
-"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:985
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
-msgstr ""
-
-#: src/grep.c:990
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-#: src/grep.c:997
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
-" --mmap use memory-mapped input if possible\n"
msgstr ""
-#: src/grep.c:1005
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
-" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
-" -a, --text equivalent to --binary-files=text\n"
-" -I equivalent to --binary-files=without-match\n"
+" -a, --text do not suppress binary output\n"
" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-#: src/grep.c:1029
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overriden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
-"and 2 if trouble.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
+"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:1044
+#: src/grep.c:950
#, fuzzy
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr " <bug0gnu-utils@prep.ai.mit.edu> ֽʽÿ.\n"
-#: src/grep.c:1054
-#, fuzzy
-msgid "conflicting matchers specified"
-msgstr "¦ ̹ Ǿ"
-
-#: src/grep.c:1347
-msgid "unknown directories method"
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1414
-#, fuzzy
-msgid "invalid max count"
-msgstr "ϰ ݺ ȸ"
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "-E, -F, -G ߿ ϳ ֽϴ"
-#: src/grep.c:1464
-msgid "unknown binary-files type"
+#: src/grep.c:1145
+msgid "matcher already specified"
+msgstr "¦ ̹ Ǿ"
+
+#: src/grep.c:1166
+msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1535
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1254
#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr ""
-"۱ (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgstr "۱ (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1256
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"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s' ȣ ɼԴϴ\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' ɼ μ ʽϴ\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' ɼ μ ʽϴ\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: `%s' ɼ μ ʿմϴ\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ν ɼ `--%s'\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ν ɼ `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ߸ ɼ -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ɼ -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ɼ μ ʿմϴ -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' ȣ ɼԴϴ\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' ɼ μ ʽϴ\n"
-
-#. 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, 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.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "%s ɼ"
-
-#~ msgid " with arg %s"
-#~ msgstr " %s μ "
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "ڰ ٸ argv ҿ ߰ߵǾϴ.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "%c ɼ\n"
-
-#~ msgid "option a\n"
-#~ msgstr "a ɼ\n"
-
-#~ msgid "option b\n"
-#~ msgstr "b ɼ\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "`%s' c ɼ\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "`%s' d ɼ\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt ڵ 0%o ־ϴ ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "ɼ ARGV : "
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "-E, -F, -G ߿ ϳ ֽϴ"
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "޸𸮰 ٴڳ\n"
+#: src/obstack.c:467
+msgid "memory exhausted\n"
+msgstr "޸𸮰 ٴڳ\n"
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Խ ð ؼ:\n"
-#~ msgid ""
-#~ " -E, --extended-regexp PATTERN is an extended regular expression\n"
+#~ msgid " -E, --extended-regexp PATTERN is an extended regular expression\n"
#~ msgstr " -E, --extended-regexp Ȯ Խ ˴ϴ\n"
-#~ msgid ""
-#~ " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
-#~ msgstr ""
-#~ " -F, --fixed-strings ٹٲ ڷ и ڿ "
-#~ "˴ϴ\n"
+#~ msgid " -F, --fixed-strings PATTERN is a fixed string separated by newlines\n"
+#~ msgstr " -F, --fixed-strings ٹٲ ڷ и ڿ ˴ϴ\n"
#~ msgid " -G, --basic-regexp PATTERN is a basic regular expression\n"
#~ msgstr " -G, --basic-regexp ⺻ Խ ˴ϴ\n"
@@ -389,15 +327,11 @@ msgstr ""
#~ msgid " -i, --ignore-case ignore case distinctions\n"
#~ msgstr " -i, --ignore-case ҹ մϴ\n"
-#~ msgid ""
-#~ " -w, --word-regexp force PATTERN to match only whole words\n"
-#~ msgstr ""
-#~ " -w, --word-regexp ü ܾ ġϴ θ մϴ\n"
+#~ msgid " -w, --word-regexp force PATTERN to match only whole words\n"
+#~ msgstr " -w, --word-regexp ü ܾ ġϴ θ մϴ\n"
-#~ msgid ""
-#~ " -x, --line-regexp force PATTERN to match only whole lines\n"
-#~ msgstr ""
-#~ " -x, --line-regexp ü ġϴ θ մϴ\n"
+#~ msgid " -x, --line-regexp force PATTERN to match only whole lines\n"
+#~ msgstr " -x, --line-regexp ü ġϴ θ մϴ\n"
#~ msgid "Miscellaneous:\n"
#~ msgstr "Ÿ:\n"
@@ -417,36 +351,26 @@ msgstr ""
#~ msgid "Output control:\n"
#~ msgstr " :\n"
-#~ msgid ""
-#~ " -b, --byte-offset print the byte offset with output lines\n"
-#~ msgstr ""
-#~ " -b, --byte-offset µǴ ࿡ Ʈ ǥմϴ\n"
+#~ msgid " -b, --byte-offset print the byte offset with output lines\n"
+#~ msgstr " -b, --byte-offset µǴ ࿡ Ʈ ǥմϴ\n"
#~ msgid " -n, --line-number print line number with output lines\n"
#~ msgstr " -n, --line-number µǴ ࿡ ȣ ǥմϴ\n"
#~ msgid " -H, --with-filename print the filename for each match\n"
-#~ msgstr ""
-#~ " -H, --with-filename ġ ϸ ǥմϴ\n"
+#~ msgstr " -H, --with-filename ġ ϸ ǥմϴ\n"
#~ msgid " -q, --quiet, --silent suppress all normal output\n"
-#~ msgstr ""
-#~ " -q, --quiet, --silent Ϲ ǥ ʽϴ\n"
+#~ msgstr " -q, --quiet, --silent Ϲ ǥ ʽϴ\n"
-#~ msgid ""
-#~ " -L, --files-without-match only print FILE names containing no match\n"
-#~ msgstr ""
-#~ " -L, --files-without-match ġ ̸ ǥմϴ\n"
+#~ msgid " -L, --files-without-match only print FILE names containing no match\n"
+#~ msgstr " -L, --files-without-match ġ ̸ ǥմϴ\n"
-#~ msgid ""
-#~ " -l, --files-with-matches only print FILE names containing matches\n"
-#~ msgstr ""
-#~ " -l, --files-with-matches ġ Ե ̸ ǥմϴ\n"
+#~ msgid " -l, --files-with-matches only print FILE names containing matches\n"
+#~ msgstr " -l, --files-with-matches ġ Ե ̸ ǥմϴ\n"
-#~ msgid ""
-#~ " -c, --count only print a count of matching lines per FILE\n"
-#~ msgstr ""
-#~ " -c, --count ϴ ġϴ ǥմϴ\n"
+#~ msgid " -c, --count only print a count of matching lines per FILE\n"
+#~ msgstr " -c, --count ϴ ġϴ ǥմϴ\n"
#~ msgid "Context control:\n"
#~ msgstr " :\n"
@@ -460,13 +384,11 @@ msgstr ""
#~ msgid " -U, --binary do not strip CR characters at EOL\n"
#~ msgstr " -U, --binary ೡ CR ڸ ߶ ʽϴ\n"
-#~ msgid ""
-#~ " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
+#~ msgid " -u, --unix-byte-offsets report offsets as if CRs were not there\n"
#~ msgstr " -u, --unix-byte-offsets CR ϰ մϴ\n"
#~ msgid "If call as `egrep', this implies -E and `fgrep' for -F.\n"
-#~ msgstr ""
-#~ "`egrep' ȣǸ -E ǰ `fgrep' -F ˴ϴ.\n"
+#~ msgstr "`egrep' ȣǸ -E ǰ `fgrep' -F ˴ϴ.\n"
#~ msgid "If no -[GEF], then -G is assumed.\n"
#~ msgstr "-[GEF] ־ -G մϴ.\n"
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 00000000..793a9b82
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,353 @@
+# Norwegian messages for GNU Grep version 2.2. (bokml dialect)
+# Copyright (C) 1996 Free Software Foundation, Inc.
+# Karl Anders ygard <karl.oygard@fou.telenor.no>, 1996.
+#
+# Eivind Tagseth <eivindt@multinet.no>, 1997
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU grep 2.2\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
+"PO-Revision-Date: 1998-08-01 13:45+0200\n"
+"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
+"Language-Team: Norwegian <no@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
+msgid "Memory exhausted"
+msgstr "Minnet oppbrukt"
+
+#: src/dfa.c:452
+msgid "Unfinished \\ escape"
+msgstr "Uferdig \\-beskyttelse"
+
+#. Cases:
+#. {M} - exact count
+#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
+#. {M,N} - M through N
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
+msgid "unfinished repeat count"
+msgstr "uferdig gjentagelsesantall"
+
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
+msgid "malformed repeat count"
+msgstr "feilaktig gjentagelsesantall"
+
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+msgid "Unbalanced ["
+msgstr "Ubalansert ["
+
+#: src/dfa.c:849
+msgid "Unbalanced ("
+msgstr "Ubalansert ("
+
+#: src/dfa.c:970
+msgid "No syntax specified"
+msgstr "Ingen syntaks spesifisert"
+
+#: src/dfa.c:978
+msgid "Unbalanced )"
+msgstr "Ubalansert )"
+
+#: src/dfa.c:1998
+msgid "out of memory"
+msgstr "tomt for minne"
+
+#: src/getopt.c:628
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagget %s er flertydig\n"
+
+#: src/getopt.c:652
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flagget --%s tar ikke argumenter\n"
+
+#: src/getopt.c:657
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flagget %c%s tar ikke argumenter\n"
+
+#: src/getopt.c:674 src/getopt.c:847
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagget %s trenger et argument\n"
+
+#. --option
+#: src/getopt.c:703
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent flagg --%s\n"
+
+#. +option or -option
+#: src/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent flagg %c%s\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:733
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig flagg -- %c\n"
+
+#: src/getopt.c:736
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldig flagg -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:766 src/getopt.c:896
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagget behver et argument -- %c\n"
+
+#: src/getopt.c:813
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagget -W %s er flertydig\n"
+
+#: src/getopt.c:831
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flagget -W %s tar ikke argumenter\n"
+
+#: src/getopt1.c:132
+#, c-format
+msgid "option %s"
+msgstr "flagg %s"
+
+#: src/getopt1.c:134
+#, c-format
+msgid " with arg %s"
+msgstr " med arg %s"
+
+#: src/getopt1.c:149
+msgid "digits occur in two different argv-elements.\n"
+msgstr "tallene forekommer i to forskjellige argv-elementer.\n"
+
+#: src/getopt1.c:151
+#, c-format
+msgid "option %c\n"
+msgstr "flagg %c\n"
+
+#: src/getopt1.c:155
+msgid "option a\n"
+msgstr "flagg a\n"
+
+#: src/getopt1.c:159
+msgid "option b\n"
+msgstr "flagg b\n"
+
+#: src/getopt1.c:163
+#, c-format
+msgid "option c with value `%s'\n"
+msgstr "flagg c med verdi %s\n"
+
+#: src/getopt1.c:167
+#, c-format
+msgid "option d with value `%s'\n"
+msgstr "flagg d med verdi %s\n"
+
+#: src/getopt1.c:174
+#, c-format
+msgid "?? getopt returned character code 0%o ??\n"
+msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
+
+#: src/getopt1.c:180
+msgid "non-option ARGV-elements: "
+msgstr "ARGV-elementer som ikke er flagg: "
+
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/kwset.c:190
+msgid "memory exhausted"
+msgstr "minnet oppbrukt"
+
+#: src/grep.c:372 src/grep.c:843
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: advarsel: %s: %s\n"
+
+#: src/grep.c:497 src/grep.c:1318
+msgid "writing output"
+msgstr "skriver utdata"
+
+#: src/grep.c:726
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:742
+msgid "(standard input)"
+msgstr "(standard inn)"
+
+#: src/grep.c:844
+msgid "recursive directory loop"
+msgstr ""
+
+#: src/grep.c:895
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "Bruk: %s [FLAGG]... MNSTER [FIL]...\n"
+
+#: src/grep.c:896
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Prv %s --help for mer informasjon.\n"
+
+#: src/grep.c:900
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+msgstr "Bruk: %s [FLAGG]... MNSTER [FIL] ...\n"
+
+#: src/grep.c:901
+msgid ""
+"Search for PATTERN in each FILE or standard input.\n"
+"\n"
+"Regexp selection and interpretation:\n"
+" -E, --extended-regexp PATTERN is an extended regular expression\n"
+" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
+" -G, --basic-regexp PATTERN is a basic regular expression\n"
+" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -f, --file=FILE obtain PATTERN from FILE\n"
+" -i, --ignore-case ignore case distinctions\n"
+" -w, --word-regexp force PATTERN to match only whole words\n"
+" -x, --line-regexp force PATTERN to match only whole lines\n"
+msgstr ""
+"Sk etter MNSTER i hver FIL eller standard inn.\n"
+"\n"
+"Regexp valg og fortolkning:\n"
+" -E, --extended-regexp MNSTER er et utvidet regulrt uttrykk\n"
+" -F, --fixed-regexp MNSTER er en fast streng separert med linjeskift\n"
+" -G, --basic-regexp MNSTER er et grunnleggende regulrt uttrykk\n"
+" -e, --regexp=MNSTER bruk MNSTER som et regulrt uttrykk\n"
+" -f, --file=FIL hent MNSTER fra FIL\n"
+" -i, --ignore-case se bort ifra forskjellen p store og sm bokstaver\n"
+" -w, --word-regexp MNSTER m stemme overens med hele ord\n"
+" -x, --line-regexp MNSTER m stemme overens med hele linjer\n"
+
+#: src/grep.c:913
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --revert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+msgstr ""
+"\n"
+"Diverse:\n"
+" -s, --no-messages undertrykk feilmeldinger\n"
+" -v, --revert-match velg linjer som ikke passer\n"
+" -V, --version vis versioninformasjon og avslutt\n"
+" --help vis denne helpeteksten og avslutt\n"
+
+#: src/grep.c:920
+#, fuzzy
+msgid ""
+"\n"
+"Output control:\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" -a, --text do not suppress binary output\n"
+" -d, --directories=ACTION how to handle directories\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
+" -L, --files-without-match only print FILE names containing no match\n"
+" -l, --files-with-matches only print FILE names containing matches\n"
+" -c, --count only print a count of matching lines per FILE\n"
+msgstr ""
+"\n"
+"Ut-kontroll:\n"
+" -b, --byte-offset skriv tegnposisjon med utlinjene\n"
+" -n, --line-number skriv linjenummeret med utlinjene\n"
+" -H, --with-filename skriv filnavnet for hver treff\n"
+" -h, --no-filename ikke skriv filnavnet\n"
+" -q, --quiet, --silent undertrykk all vanlig utskrift\n"
+" -L, --files-without-match skriv bare ut navnene p FILene som ikke\n"
+" inneholder treff\n"
+" -l, --files-with-matches skriv bare ut navnene p FILene som inneholder\n"
+" treff\n"
+" -c, --count skriv bare ut antall linjer som inneholder treff\n"
+" per FIL\n"
+
+#: src/grep.c:935
+#, fuzzy
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overriden by -A or -B\n"
+" -NUM same as --context=NUM\n"
+" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
+" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
+"\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
+"Exit with 2 if syntax errors or system errors.\n"
+msgstr ""
+"\n"
+"Kontekst-kontroll:\n"
+" -B, --before-context=ANT skriv ANT linjer med ledende kontekst\n"
+" -A, --after-context=ANT skriv ANT linjer med etterflgende kontekst\n"
+" -ANT samme som bde -B ANT og -A ANT\n"
+" -C, --context samme som -2\n"
+" -U, --binary ikke fjern CR-tegn ved EOL (MSDOS)\n"
+" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
+" (MSDOS)\n"
+
+#: src/grep.c:950
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRapportr feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
+
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+msgid "invalid context length argument"
+msgstr "ugyldig kontekstlengde"
+
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "du kan bare spesifisere en av -E, -F eller -G"
+
+#: src/grep.c:1145
+msgid "matcher already specified"
+msgstr "skeuttrykk er allerede spesifisert"
+
+#: src/grep.c:1166
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
+msgstr "grep (GNU grep) %s\n"
+
+#: src/grep.c:1254
+#, fuzzy
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:1256
+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 ""
+"Dette er fri programvare, se kildekoden for kopieringsbetingelser. Det\n"
+"er INGEN garanti, ikke en gang for SALGBARHET eller EGNETHET FOR NOEN \n"
+"SPESIELL OPPGAVE.\n"
+
+#: src/obstack.c:467
+msgid "memory exhausted\n"
+msgstr "minnet oppbrukt\n"
+
+#~ msgid "(standard input)\n"
+#~ msgstr "(standard inn)\n"
diff --git a/po/nl.po b/po/nl.po
index 79503be3..87bce121 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,113 +1,162 @@
# Dutch messages for GNU grep.
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000 Free Software Foundation, Inc.
+# Ivo Timmermans <itimmermans@bigfoot.com>, 2000.
# Erick Branderhorst <branderh@debian.org>, 1996.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.0\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 1996-08-18 11:24 EDT\n"
-"Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
+"Project-Id-Version: GNU grep 2.4f\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-05-21 03:57+02:00\n"
+"Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
"Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
-#, fuzzy
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
-msgstr "geen geheugen meer beschikbaar"
+msgstr "Geen geheugen meer beschikbaar"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr ""
-
-#: src/dfa.c:741
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
-msgstr ""
+msgstr "Onafgemaakte \\ escape"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
-msgstr ""
+msgstr "Onafgemaakt herhalingsaantal"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
-msgstr ""
+msgstr "foutief herhalingsaantal"
+
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
+msgid "Unbalanced ["
+msgstr "Ongebalanceerde ["
-#: src/dfa.c:1239
+#: src/dfa.c:886
msgid "Unbalanced ("
-msgstr ""
+msgstr "Ongebalanceerde ("
-#: src/dfa.c:1364
+#: src/dfa.c:1000
msgid "No syntax specified"
-msgstr ""
+msgstr "Geen syntax opgegeven"
-#: src/dfa.c:1372
+#: src/dfa.c:1008
msgid "Unbalanced )"
-msgstr ""
+msgstr "Ongebalanceerde )"
-#: src/dfa.c:2942
+#: src/dfa.c:1994
msgid "out of memory"
-msgstr ""
+msgstr "geheugen is op"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
-msgid "memory exhausted"
-msgstr "geen geheugen meer beschikbaar"
+#: src/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: optie `%s' is dubbelzinnig\n"
-#: src/grep.c:191
-msgid "invalid context length argument"
-msgstr ""
+#: src/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: optie `--%s' staat geen argumenten toe\n"
-#: src/grep.c:458
-msgid "input is too large to count"
-msgstr ""
+#: src/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: optie `%c%s' staat geen argumenten toe\n"
+
+#: src/getopt.c:723 src/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: optie `%s' vereist een argument\n"
-#: src/grep.c:531
+#. --option
+#: src/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: Onbekende optie `--%s'\n"
+
+#. +option or -option
+#: src/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: onbekende optie `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ongeldige optie -- %c\n"
+
+#: src/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ongeldige optie -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:815 src/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: optie vereist een argument -- %c\n"
+
+#: src/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: optie `-W %s' is dubbelzinnig\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: optie `-W %s' staat geen argumenten toe\n"
+
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
+msgid "memory exhausted"
+msgstr "geen geheugen meer beschikbaar"
+
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "schrijven van uitvoer"
-#: src/grep.c:804
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
-msgstr ""
+msgstr "Binair bestand %s komt overeen\n"
-#: src/grep.c:818
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(standaardinvoer)"
-#: src/grep.c:923
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
msgstr "%s: let op: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:888
msgid "recursive directory loop"
-msgstr ""
+msgstr "recursieve map herhaling"
-#: src/grep.c:972
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr ""
+msgstr "Gebruik: %s [OPTIE]... PATROON [BESTAND]...\n"
-#: src/grep.c:974
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "Probeer `%s --help' voor meer informatie.\n"
-#: src/grep.c:979
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr ""
+msgstr "Gebruik: %s [OPTIE]... PATROON [BESTAND] ...\n"
-#: src/grep.c:980
+#: src/grep.c:944
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -115,16 +164,23 @@ msgid ""
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
+"Zoek voor PATROON in ieder BESTAND of standaard invoer.\n"
+"Voorbeeld: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Selectie en interpretatie van reguliere expressies:\n"
-#: src/grep.c:985
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
+" -E, --extended-regexp PATROON is een uitgebreide reguliere expressie\n"
+" -F, --fixed-strings PATROON is een verzameling van strings, op\n"
+" aparte regels\n"
+" -G, --basic-regexp PATROON is een basis reguliere expressie\n"
-#: src/grep.c:990
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -133,8 +189,14 @@ msgid ""
" -x, --line-regexp force PATTERN to match only whole lines\n"
" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
+" -e, --regexp=PATROON gebruik PATROON als reguliere exprossie\n"
+" -f, --file=BESTAND haal PATROON uit BESTAND\n"
+" -i, --ignore-case negeer hoofd-/kleine letters\n"
+" -w, --word-regexp forceer PATROON om alleen hele woorden te zoeken\n"
+" -x, --line-regexp forceer PATROON om alleen hele regels te zoeken\n"
+" -z, --null-data een dataregel eindigt in een 0 byte, niet nieuwe regel\n"
-#: src/grep.c:997
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -144,44 +206,63 @@ msgid ""
" --help display this help and exit\n"
" --mmap use memory-mapped input if possible\n"
msgstr ""
-
-#: src/grep.c:1005
+"\n"
+"Divers:\n"
+" -s, --no-messages onderdruk foutmeldingen\n"
+" -v, --invert-match selecteer niet overeenkomende regels\n"
+" -V, --version toon versie informatie en beindig\n"
+" --help toon deze hulptekst en beindig\n"
+" --mmap gebruik gemmapte invoer indien mogelijk\n"
+
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
" -a, --text equivalent to --binary-files=text\n"
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-
-#: src/grep.c:1029
+"\n"
+"Uitvoer opties:\n"
+" -b, --byte-offset geef byteadres bij de uitvoerregels\n"
+" -n, --line-number geef een regelnummer bij de uitvoerregels\n"
+" -H, --with-filename geef de bestandsnaam bij iedere overeenkomst\n"
+" -h, --no-filename onderdruk het toevoegen van de bestandsnaam\n"
+" -q, --quiet, --silent onderdruk alle normale uitvoer\n"
+" --binary-files=TYPE neem aan dat binaire bestanden van TYPE zijn\n"
+" TYPE is `binary', `text', of `without-match'.\n"
+" -a, --text gelijk aan --binary-files=text\n"
+" -I gelijk aan --binary-files=without-match\n"
+" -d, --directories=ACTIE hoe mappen te behandelen\n"
+" ACTIE is `read', `recurse' of `skip'.\n"
+" -r, --recursive gelijk aan --directories=recurse.\n"
+" -L, --files-without-match geef alleen BESTANDsnamen zonder overeenkomst\n"
+" -l, --files-with-matches geef alleen BESTANDsnamen met overeenkomsten\n"
+" -c, --count geef alleen het aantal overeenkomsten per BESTAND\n"
+" -Z, --null print 0 byte na iedere BESTANDsnaam\n"
+
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -190,12 +271,28 @@ msgid ""
"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
"and 2 if trouble.\n"
msgstr ""
-
-#: src/grep.c:1044
-msgid ""
"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+"Contextbesturing:\n"
+" -B, --before-context=NUM geef NUM regels voorafgaande context\n"
+" -A, --after-context=NUM geef NUM regels achterafkomende context\n"
+" -C, --context[=NUM] geef NUM (standaard 2) regels context\n"
+" tenzij ook -A of -B gegeven is\n"
+" -NUM zelfde als --context=NUM\n"
+" -U, --binary haal geen CR tekens weg bij EOL (MSDOS)\n"
+" -u, --unix-byte-offsets geef adressen alsof CRs er niet waren (MSDOS)\n"
+"\n"
+"`egrep' betkent `grep -E'. `fgrep' betekent `grep -F'.\n"
+"Indien geen BESTAND is gegeven, of BESTAND is -, wordt de standaard\n"
+"invoer gelezen. Indien minder dan twee BESTANDen gegeven zijn, wordt\n"
+"-h aangenomen. Afsluitwaarde is 0 in geval van overeenkomsten, 1\n"
+"indien geen, en 2 indien er iets mis is.\n"
+
+#: src/grep.c:1002
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
+"\n"
+"Meld fouten in het programma aan <bug-gnu-utils@gnu.org>;\n"
+"meld fouten in de vertaling aan <nl@li.org>.\n"
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
@@ -205,140 +302,36 @@ msgstr ""
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opcisn -X es a la que corresponde esta lmnea.
-#: src/grep.c:1054
-#, fuzzy
+#: src/grep.c:1012
msgid "conflicting matchers specified"
-msgstr "overeenkomer (matcher FIXME) al gespecificeerd"
+msgstr "conflicterende `matchers' opgegeven"
-#: src/grep.c:1347
-msgid "unknown directories method"
-msgstr ""
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
+msgid "invalid context length argument"
+msgstr "ongeldig contextlengte-argument"
-#: src/grep.c:1414
-msgid "invalid max count"
-msgstr ""
+#: src/grep.c:1273
+msgid "unknown directories method"
+msgstr "onbekend mappen methode"
-#: src/grep.c:1464
+#: src/grep.c:1358
msgid "unknown binary-files type"
-msgstr ""
+msgstr "onbekend binair bestanstype"
-#: src/grep.c:1535
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
-msgstr ""
+msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr ""
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1382
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 ""
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#. 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, 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.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "alleen de volgende opties zijn toegestaan: -E, -F, of -G"
-
-#, fuzzy
-#~ msgid "memory exhausted\n"
-#~ msgstr "geen geheugen meer beschikbaar"
-
-#~ msgid "GNU grep version 2.0"
-#~ msgstr "(FIXME) GNU grep version 2.0"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standaardinvoer)\n"
+"Dit is vrije programmatuur; zie de broncode voor kopieervoorwaarden.\n"
+"Er is GEEN garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID\n"
+"VOOR EEN BEPAALD DOEL.\n"
diff --git a/po/pl.po b/po/pl.po
index 4aa4dbb3..544ad10c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
# Polish translation of the GNU grep messages
-# Copyright (C) 1995-1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-# Rafa Maszkowski <rzm@icm.edu.pl>, 1996-2001.
+# Copyright (C) 1995-1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Rafa Maszkowski <rzm@icm.edu.pl>, 1996-2002.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-06-04 21:45+0200\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-13 13:00+0100\n"
"Last-Translator: Rafa Maszkowski <rzm@icm.edu.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Pami wyczerpana"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ nie do pary"
@@ -40,73 +37,72 @@ msgstr "niedokoczona liczba powtrze"
msgid "malformed repeat count"
msgstr "le sformatowana liczba powtrze"
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Brak specyfikacji skadni"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "brak pamici"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "pami wyczerpana"
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "bdny argument dugoci kontekstowej"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "danych wejciowych jest zbyt duo do policzenia"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "zapisuj wyniki"
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Plik binarny %s pasuje do wzorca\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standardowe wejcie)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "uwaga: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "nieskoczona ptla przegldania katalogw"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Sprbuj `%s --help' dla uzyskania informacji.\n"
+msgstr "Napisz `%s --help' eby dowiedzie si wicej.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Wybr i interpretacja wyrae regularnych:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp WZORZEC jest podstawowym wyr. regularnym\n"
" -P, --perl-regexp WZORZEC jest wyraeniem regularnym perla\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -145,9 +141,10 @@ msgstr ""
" -i, --ignore-case zignorowanie ronic midzy maymi i wlk. lit.\n"
" -w, --word-regexp dopasowanie WZORZEC tylko do penych sw\n"
" -x, --line-regexp dopasowanie WZORZEC tylko do caych linii\n"
-" -z, --null-data linie s zakoczone bajtem 0, nie now lini\n"
+" -z, --null-data linie s zakoczone bajtem 0, nie znakiem\n"
+" nowej linii\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,8 +162,7 @@ msgstr ""
" --help wywietl t informacj i zakocz\n"
" --mmap jeeli moliwe mapuj pliki w pamici\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -176,6 +172,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -183,11 +181,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -201,26 +200,29 @@ msgstr ""
" --line-buffered oprnienie buf. wyj. po kadej linii\n"
" -H, --with-filename wypisanie nazwy pliku dla kadej linii\n"
" -h, --no-filename bez nazwy pliku w liniach wyjciowych\n"
+" --label=ETYKIETA w wyniku ETYKIETA zastpuje nazwe pliku\n"
+" -o, --only-matching pokazanie tylko kawaka, ktry pasuje do WZORCA\n"
" -q, --quiet, --silent wyczenie wypisywanie wyniku\n"
" --binary-files=TYP zaoenie, e pliki binarne s typu TYP\n"
" TYP to 'binary', 'text' lub 'without-match'.\n"
" -a, --text rwnowane --binary-files=text\n"
" -I rwnowane --binary-files=without-match\n"
-" -d, --directories=AKCJA jak si obchodzi z katalogami\n"
-" AKCJA to `read' (czytanie), `recurse'\n"
+" -d, --directories=DZIAANIE jak si obchodzi z katalogami,\n"
+" DZIAANIE to `read' (czytanie), `,recurse'\n"
" (przegldanie rekurencujne) albo 'skip'\n"
" (pominicie).\n"
+" -D, --devices=DZIAANIE jak odwoywa si do urzdze, FIFO i gniazd,\n"
+" DZIAANIE to 'read' (czytaj) albo 'skip' (pomi)\n"
" -R, -r, --recursive rwnowane --directories=recurse .\n"
" --include=WZORZEC przeszukiwane bd pliki pasujce do WZORCA\n"
" --exclude=WZORZEC pliki pasujce do WZORCA bd pominite\n"
" --exclude-from=PLIK pominicie plikw pasujcych do WZORCW w PLIKU\n"
" -L, --files-without-match wypisanie tylko nazw PLIKW bez trafie\n"
" -l, --files-with-matches wypisanie tylko nazw PLIKW z trafieniami\n"
-" -c, --count wypisanie tylko iloci pasujcych linii w "
-"PLIKACH\n"
+" -c, --count wypisanie tylko iloci pasujcych linii w PLIKACH\n"
" -Z, --null wypisanie bajtu 0 po kadej nazwie PLIKU\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -228,7 +230,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -241,19 +245,21 @@ msgstr ""
"Sterowanie kontekstem:\n"
" -B, --before-context=ILE wypisanie ILE linii kontekstu przed\n"
" -A, --after-context=ILE wypisanie ILE linii kontekstu po\n"
-" -C, --context[=NUM] wypisanie ILE (domylnie 2) linii kontekstu\n"
-" -NUM to samo co --context=NUM\n"
-" --color, --colour uycie znacznikw pasujcych cigw znakw\n"
+" -C, --context[=ILE] wypisanie ILE (domylnie 2) linii kontekstu\n"
+" -ILE to samo co --context=ILE\n"
+" --color[=KIEDY],\n"
+" --colour[=KIEDY] oznaczanie pasujcych znakw,\n"
+" KIEDY to `always' (zawsze), `never' (nigdy)\n"
+" albo `auto' (automatycznie).\n"
" -U, --binary bez usuwania znakw nowej linii na kocu\n"
-" -u, --unix-byte-offsets podawanie pozycji tak jakby nie byo CRw "
-"(MSDOS)\n"
+" -u, --unix-byte-offsets podawanie pozycji tak jakby nie byo CRw (MSDOS)\n"
"\n"
"`egrep' oznacza `grep -E'. `fgrep' oznacza `grep -F'.\n"
"Bez PLIKu albo gdy PLIK to -, czytane jest standardowe wejcie. Jeeli\n"
"podano mniej ni dwa PLIKi, zakada -h. Zakoczenie z kodem 0 jeeli\n"
"WZORZEC pasuje, z 1, jeeli nie, z 2, jeeli s problemy.\n"
-#: src/grep.c:1044
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -269,41 +275,42 @@ msgstr ""
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opcin -X es a la que corresponde esta lnea.
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
-msgstr "podane konfliktujce wzorce"
+msgstr "podane sprzeczne wzorce"
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "nieznany sposb przegldania urzdze"
+
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "nieznany sposb przegldania katalogw"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "bdna maksymalna liczba powtrze"
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "nieznany typ pliku binarnego"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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 ""
-"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s w kodzie "
-"rdowym.\n"
-"Nie podlega adnej gwarancji, nawet gwarancji przydatnoci do "
-"jakiegokolwiek\n"
+"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s w kodzie rdowym.\n"
+"Nie podlega adnej gwarancji, nawet gwarancji przydatnoci do jakiegokolwiek\n"
"zastosowania lub sprzeday.\n"
#: src/search.c:606
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ee30dce7..50cd9ae1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,27 +5,20 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.4a\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2000-01-21 22:08-02:00\n"
+"Project-Id-Version: GNU grep 2.4f\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
+"PO-Revision-Date: 2000-10-27 16:55-02:00\n"
"Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Memria esgotada"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "[ desbalanceado"
-
-#: src/dfa.c:741
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "escape inacabado"
@@ -33,82 +26,138 @@ msgstr "escape inacabado"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "contador de repetio invlido"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "contador de repetio invlido"
-#: src/dfa.c:1239
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
+msgid "Unbalanced ["
+msgstr "[ desbalanceado"
+
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "( desbalanceado"
-#: src/dfa.c:1364
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Sintaxe no especificada"
-#: src/dfa.c:1372
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr ") desbalanceado"
-#: src/dfa.c:2942
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "memria esgotada"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
-msgid "memory exhausted"
-msgstr "memria esgotada"
+#: src/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opo `%s' ambgua\n"
-#: src/grep.c:191
-msgid "invalid context length argument"
-msgstr "argumento tamanho do contexto invlido"
+#: src/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opo `--%s' no aceita um argumento\n"
-#: src/grep.c:458
-msgid "input is too large to count"
-msgstr ""
+#: src/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opo `%c%s' no aceita um argumento\n"
+
+#: src/getopt.c:723 src/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opo `%s' requer um argumento\n"
+
+#. --option
+#: src/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opo `--%s' no reconhecida\n"
+
+#. +option or -option
+#: src/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opo `%c%s' no reconhecida\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opo ilegal -- %c\n"
+
+#: src/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opo invlida -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:815 src/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opo espera um argumento -- %c\n"
-#: src/grep.c:531
+#: src/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opo `-W %s' ambgua\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opo `-W %s' no aceita um argumento\n"
+
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
+msgid "memory exhausted"
+msgstr "memria esgotada"
+
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "escrevendo sada"
-#: src/grep.c:804
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Arquivo binrio %s casa com o padro\n"
-#: src/grep.c:818
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(entrada padro)"
-#: src/grep.c:923
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
msgstr "%s: aviso: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "loop de diretrio recursivo"
-#: src/grep.c:972
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [opo]... padro [arquivo]...\n"
-#: src/grep.c:974
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informaes.\n"
-#: src/grep.c:979
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uso: %s [opo]... padro [arquivo]...\n"
-#: src/grep.c:980
-#, fuzzy, c-format
+#: src/grep.c:944
+#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
"Example: %s -i 'hello world' menu.h main.c\n"
@@ -116,24 +165,21 @@ msgid ""
"Regexp selection and interpretation:\n"
msgstr ""
"Procura por PADRO em cada ARQUIVO ou entrada padro.\n"
-"Exemplo: %s -i 'hello.*world' menu.h main.c\n"
+"Exemplo: %s -i 'hello world' menu.h main.c\n"
"\n"
"Seleo de expresso regular e interpretao:\n"
-#: src/grep.c:985
-#, fuzzy
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp PADRO um expresso regular extendida\n"
-" -F, --fixed-strings PADRO uma cadeia fixa separada por nova "
-"linha\n"
+" -F, --fixed-strings PADRO uma cadeia fixa separada por nova linha\n"
" -G, --basic-regexp PADRO um expresso regular bsica\n"
-#: src/grep.c:990
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,10 +193,9 @@ msgstr ""
" -i, --ignore-case ignora caixa do texto\n"
" -w, --word-regexp fora PADRO encontrar apenas palavras inteiras\n"
" -x, --line-regexp fora PADRO encontrar apenas linhas inteiras\n"
-" -z, --null-data uma linha de dados acaba com 0 bytes, no nova "
-"linha\n"
+" -z, --null-data uma linha de dados acaba com 0 bytes, no nova linha\n"
-#: src/grep.c:997
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,29 +213,22 @@ msgstr ""
" --help exibe esta ajuda e sai\n"
" --mmap usa entrada de memria mapeada se possvel\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
" -a, --text equivalent to --binary-files=text\n"
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -208,29 +246,25 @@ msgstr ""
" --binary-files=TIPO assume que arquivos binrios so TIPO\n"
" TIPO 'binary'. 'text', ou 'without-match'.\n"
" -d, --directories=AO como tratar diretrios\n"
-" AO pode ser: 'read' (ler), 'recurse' "
-"(recursivo),\n"
+" AO pode ser: 'read' (ler), 'recurse' (recursivo),\n"
" ou 'skip' (no considerar).\n"
" -r, --recursive equivalente a --directories=recurse.\n"
-" -L, --files-without-match exibe somente os nomes dos arquivos onde no "
-"foi\n"
+" -L, --files-without-match exibe somente os nomes dos arquivos onde no foi\n"
" encontrado o padro\n"
" -l, --files-with-matches exibe somente os nomes dos arquivos onde foi\n"
" encontrado o padro\n"
-" -c, --count exibe o nmero de padres encontrados por "
-"arquivo\n"
+" -c, --count exibe o nmero de padres encontrados por arquivo\n"
" -Z, --null mostra 0 bytes depois do nome do ARQUIVO\n"
-#: src/grep.c:1029
-#, fuzzy
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -257,43 +291,37 @@ msgstr ""
"Retorna 0 se encontra o padro, 1 se no encontra.\n"
"Retorna 2 se houver erro de sintaxe ou erros do sistema.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr ""
-"\n"
-"Informe problemas para <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1002
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nInforme problemas para <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1054
+#: src/grep.c:1012
msgid "conflicting matchers specified"
msgstr "padres de procura especificados conflitam"
-#: src/grep.c:1347
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
+msgid "invalid context length argument"
+msgstr "argumento tamanho do contexto invlido"
+
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "mtodo desconhecido de diretrios"
-#: src/grep.c:1414
-#, fuzzy
-msgid "invalid max count"
-msgstr "contador de repetio invlido"
-
-#: src/grep.c:1464
+#: src/grep.c:1358
msgid "unknown binary-files type"
msgstr "tipo de arquivo binrio desconhecido"
# msgstr "la expresin a buscar ya fue especificada"
-#: src/grep.c:1535
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
-#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1998, 1999 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
+msgstr "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1382
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"
@@ -302,99 +330,6 @@ msgstr ""
"existe garantia; nem mesmo para cpias compradas ou adaptadas para um \n"
"propsito particular\n"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opo `%s' ambgua\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opo `--%s' no aceita um argumento\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opo `%c%s' no aceita um argumento\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opo `%s' requer um argumento\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opo `--%s' no reconhecida\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opo `%c%s' no reconhecida\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opo ilegal -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opo invlida -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opo espera um argumento -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opo `-W %s' ambgua\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opo `-W %s' no aceita um argumento\n"
-
-#. 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, 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.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
#~ msgid "option %s"
#~ msgstr "opo %s"
diff --git a/po/ru.po b/po/ru.po
index cb14c4fc..3513ced7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-03-07 00:02-0500\n"
-"PO-Revision-Date: 2002-01-07 18:57GMT+06\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-09 12:18GMT+06\n"
"Last-Translator: Denis Perchine <dyp@perchine.com>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
@@ -14,18 +14,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
msgid "Memory exhausted"
msgstr " "
-#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
-#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
-#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
-#: src/dfa.c:1045 src/dfa.c:1046
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr " ["
-#: src/dfa.c:738
+#: src/dfa.c:741
msgid "Unfinished \\ escape"
msgstr " \\ "
@@ -33,81 +30,80 @@ msgstr " \\ "
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
msgid "unfinished repeat count"
msgstr " "
-#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
msgid "malformed repeat count"
msgstr " "
-#: src/dfa.c:1232
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr " ("
-#: src/dfa.c:1357
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr " "
-#: src/dfa.c:1365
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr " )"
-#: src/dfa.c:2933
+#: src/dfa.c:2956
msgid "out of memory"
msgstr " "
-#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
-#: src/search.c:103 src/search.c:223 src/search.c:307
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr " "
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr " "
-#: src/grep.c:466
+#: src/grep.c:475
msgid "input is too large to count"
msgstr " , "
-#: src/grep.c:539
+#: src/grep.c:597
msgid "writing output"
msgstr " "
-#: src/grep.c:812
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr " %s \n"
-#: src/grep.c:826
+#: src/grep.c:884
msgid "(standard input)"
msgstr "( )"
-#: src/grep.c:931
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr ": %s: %s\n"
-#: src/grep.c:932
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr " "
-#: src/grep.c:980
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s [OPTION]... PATTERN [FILE]...\n"
-#: src/grep.c:982
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " `%s --help' .\n"
-#: src/grep.c:987
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s [OPTION]... PATTERN [FILE] ...\n"
-#: src/grep.c:988
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +116,7 @@ msgstr ""
"\n"
" :\n"
-#: src/grep.c:993
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,7 +129,7 @@ msgstr ""
" -G, --basic-regexp PATTERN \n"
" -P, --perl-regexp PATTERN Perl\n"
-#: src/grep.c:998
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -153,7 +149,7 @@ msgstr ""
" -z, --null-data 0, \n"
" \n"
-#: src/grep.c:1005
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -171,7 +167,7 @@ msgstr ""
" --help \n"
" --mmap mmap \n"
-#: src/grep.c:1013
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -181,6 +177,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -188,10 +186,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examine\n"
-" --exclude=PATTERN files that match PATTERN will be skip.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be skip.\n"
+" --include=PATTERN files that match PATTERN will be examined\n"
+" --exclude=PATTERN files that match PATTERN will be skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -206,6 +206,7 @@ msgstr ""
" --line-buffered \n"
" -H, --with-filename \n"
" -h, --no-filename \n"
+" --label=LABEL LABEL \n"
" -q, --quiet, --silent \n"
" --binary-files=TYPE :\n"
" TYPE - 'binary', 'text', 'without-match'.\n"
@@ -214,6 +215,8 @@ msgstr ""
" -d, --directories=ACTION \n"
" ACTION 'read' (),\n"
" 'recurse' (), 'skip' ().\n"
+" -D, --devices=ACTION , \n"
+" ACTION 'read' 'skip'\n"
" -R, -r, --recursive --directories=recurse.\n"
" --include=PATTERN , PATTERN\n"
" --exclude=PATTERN , PATTERN.\n"
@@ -223,7 +226,7 @@ msgstr ""
" -c, --count \n"
" -Z, --null 0 \n"
-#: src/grep.c:1037
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -231,7 +234,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -246,6 +251,9 @@ msgstr ""
" -A, --after-context=NUM NUM \n"
" -C, --context[=NUM] NUM ,\n"
" -A -B\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] \n"
+" WHEN `always' (), `never' () `auto' ().\n"
" --color, --colour \n"
" -NUM , --context=NUM\n"
" -U, --binary CR (MSDOS)\n"
@@ -256,36 +264,44 @@ msgstr ""
", , -h. 0 ,\n"
" 1, . 2, .\n"
-#: src/grep.c:1052
-msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
-msgstr "\n <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1116
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+" <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1062
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr " "
-#: src/grep.c:1355
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr " "
+
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr " "
-#: src/grep.c:1422
+#: src/grep.c:1497
msgid "invalid max count"
msgstr " "
-#: src/grep.c:1472
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr " "
-#: src/grep.c:1543
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1545
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1547
+#: src/grep.c:1650
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"
@@ -294,11 +310,11 @@ msgstr ""
" . , \n"
" .\n"
-#: src/search.c:623
+#: src/search.c:606
msgid "The -P option is not supported"
msgstr " -P "
-#: src/search.c:636
+#: src/search.c:619
msgid "The -P and -z options cannot be combined"
msgstr " -P -z "
@@ -379,10 +395,10 @@ msgstr "%s: `-W %s' \n"
#. 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.
-#: lib/quotearg.c:265
+#: lib/quotearg.c:259
msgid "`"
msgstr "\""
-#: lib/quotearg.c:266
+#: lib/quotearg.c:260
msgid "'"
msgstr "\""
diff --git a/po/sl.po b/po/sl.po
index 072ca874..8c542059 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,13 +2,13 @@
# Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
# Primo Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999, 2000.
#
-# $Id: sl.po,v 1.26 2001/08/25 16:25:54 alainm Exp $
+# $Id: sl.po,v 1.27 2002/03/13 13:45:56 bero Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
-"PO-Revision-Date: 2001-06-08 13:22+02:00\n"
+"Project-Id-Version: GNU grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-11 09:25+0100\n"
"Last-Translator: Primo Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,10 +19,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Pomnilnik porabljen"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "Oklepaj [ brez zaklepaja"
@@ -42,73 +39,72 @@ msgstr "nedokonano tevilo ponovitev"
msgid "malformed repeat count"
msgstr "slabo doloeno tevilo ponovitev"
-#: src/dfa.c:1239
+#: src/dfa.c:1253
msgid "Unbalanced ("
msgstr "Oklepaj ( brez zaklepaja"
-#: src/dfa.c:1364
+#: src/dfa.c:1378
msgid "No syntax specified"
msgstr "Skladnja ni podana"
-#: src/dfa.c:1372
+#: src/dfa.c:1386
msgid "Unbalanced )"
msgstr "Zaklepaj ) brez oklepaja"
-#: src/dfa.c:2942
+#: src/dfa.c:2956
msgid "out of memory"
msgstr "zmanjkalo pomnilnika"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
-#: src/grep.c:191
+#: src/grep.c:205
msgid "invalid context length argument"
msgstr "velikost konteksta ni veljavna"
-#: src/grep.c:458
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "vhod je prevelik, da bi ga mogli preteti"
-#: src/grep.c:531
+#: src/grep.c:597
msgid "writing output"
msgstr "pisanje rezultatov"
-#: src/grep.c:804
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarna datoteka %s ustreza\n"
-#: src/grep.c:818
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standardni vhod)"
-#: src/grep.c:923
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "pozor: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "rekurzivna zanka imenikov"
-#: src/grep.c:972
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n"
-#: src/grep.c:974
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help` za dodatna pojasnila.\n"
-#: src/grep.c:979
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA] ...\n"
-#: src/grep.c:980
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,7 +117,7 @@ msgstr ""
"\n"
"Izbira in tolmaenje regularnih izrazov:\n"
-#: src/grep.c:985
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,7 +129,7 @@ msgstr ""
" -G, --basic-regexp VZOREC je osnovni regularni izraz\n"
" -P, --perl-regexp VZOREC je regularni izraz z raziritvami perla\n"
-#: src/grep.c:990
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -150,7 +146,7 @@ msgstr ""
" -z, --null-data vrstica podatkov je konana z znakom NUL, ne z\n"
" znakom za skok v novo vrstico\n"
-#: src/grep.c:997
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,8 +164,7 @@ msgstr ""
" --help ta pomo\n"
" --mmap e je mono, uporabi pomnilniko preslikan vhod\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -179,6 +174,8 @@ msgid ""
" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
" --binary-files=TYPE assume that binary files are TYPE\n"
" TYPE is 'binary', 'text', or 'without-match'\n"
@@ -186,11 +183,12 @@ msgid ""
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
" --include=PATTERN files that match PATTERN will be examined\n"
" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -204,27 +202,28 @@ msgstr ""
" --line-buffered izhodni medpomnilnik izpraznimo vsako vrstico\n"
" -H, --with-filename z izpisom imena datoteke\n"
" -h, --no-filename brez izpisa imena datoteke\n"
+" --label=OZNAKA z navedeno OZNAKO, kadar beremo s standardnega vhoda\n"
+" -o, --only-matching izpis samo dela vrstice z VZORCEM\n"
" -q, --quiet, --silent brez vsega obiajnega izpisa\n"
" --binary-type=TIP privzemi izbrani TIP binarne datoteke\n"
-" TIP je lahko ,binary`, ,text` ali "
-",without-match`\n"
+" TIP je lahko ,binary`, ,text` ali ,without-match`\n"
" -a, --text isto kot --binary-type=text\n"
" -I isto kot --binary-type=without-match\n"
-" -d, --directories=AKCIJA kako obravnavamo imenike\n"
-" AKCIJA je lahko ,read`, ,recurse` ali ,skip`\n"
+" -d, --directories=DEJANJE kako obravnavamo imenike\n"
+" DEJANJE je lahko ,read`, ,recurse` ali ,skip`\n"
+" -D, --devices=DEJANJE kako obravnavamo datoteke naprav\n"
+" DEJANJE je lahko ,read` ali ,skip`\n"
" -R, -r, --recursive isto kot --directories=recurse\n"
" --include=VZOREC preiemo le datoteke, ki ustrezajo VZORCU\n"
" --exclude=VZOREC izpustimo datoteke, ki ustrezajo VZORCU\n"
-" --exclude-from=DATOTEKA izpustimo datoteke, ki ustrezajo vzorcu v "
-"DATOTEKI\n"
-" -L, --files-without-match le imena tistih DATOTEK, kjer VZORCA nismo "
-"nali\n"
+" --exclude-from=DATOTEKA izpustimo datoteke, ki ustrezajo vzorcu v DATOTEKI\n"
+" -L, --files-without-match le imena tistih DATOTEK, kjer VZORCA nismo nali\n"
" -l, --files-with-matches le imena tistih DATOTEK, kjer smo VZOREC nali\n"
-" -c, --count le tevilo vrstic, v katerih se v DATOTEKI\n"
+" -c, --count le skupno tevilo vrstic v DATOTEKI, v katerih se\n"
" pojavi VZOREC\n"
" -Z, --null izpii znak NUL za imenom DATOTEKE\n"
-#: src/grep.c:1029
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -232,7 +231,9 @@ msgid ""
" -A, --after-context=NUM print NUM lines of trailing context\n"
" -C, --context=NUM print NUM lines of output context\n"
" -NUM same as --context=NUM\n"
-" --color, --colour use markers to distinguish the matching string\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -245,22 +246,18 @@ msgstr ""
"Nadzor nad kontekstom:\n"
" -B, --before-context=T T vrstic konteksta pred vrstico z VZORCEM\n"
" -A, --after-context=T T vrstic konteksta za vrstico z VZORCEM\n"
-" -C, --context[=T] T vrstic konteksta pred in za vrstico z "
-"VZORCEM\n"
+" -C, --context[=T] T vrstic konteksta pred in za vrstico z VZORCEM\n"
" -T isto kot --context=T\n"
" --color, --colour ujemajoe nize barvno oznaimo\n"
" -U, --binary ne poreemo znakov CR na koncu vrstic (MS-DOS)\n"
" -u, --unix-byte-offsets v odmikih ne tejemo znakov CR (MS-DOS)\n"
"\n"
"Ukaz ,egrep` pomeni isto kot ,grep -E`, ,fgrep` pa isto kot ,grep -F`.\n"
-"e DATOTEKA ni podana ali pa je -, beremo s standardnega vhoda. e sta "
-"podani\n"
-"manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je ni, e smo "
-"VZOREC\n"
-"nali, ena e ga nismo. Izhodna koda 2 pomeni skladenjsko ali sistemsko "
-"napako.\n"
-
-#: src/grep.c:1044
+"e DATOTEKA ni podana ali pa je -, beremo s standardnega vhoda. e sta podani\n"
+"manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je ni, e smo VZOREC\n"
+"nali, ena, e ga nismo, 2 pa pomeni skladenjsko ali sistemsko napako.\n"
+
+#: src/grep.c:1116
msgid ""
"\n"
"Report bugs to <bug-gnu-utils@gnu.org>.\n"
@@ -273,39 +270,41 @@ msgstr ""
# opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:1054
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "podana navodila si nasprotujejo"
-#: src/grep.c:1347
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "neznana metoda datotek naprav"
+
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "neznana metoda imenikov"
-#: src/grep.c:1414
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "neveljavno najveje tevilo"
-#: src/grep.c:1464
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "neznan tip binarne datoteke"
-#: src/grep.c:1535
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr ""
-"Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1650
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 ""
-"To je prost program; pogoji, pod katerimi ga lahko uporabljate, "
-"razmnoujete\n"
+"To je prost program; pogoji, pod katerimi ga lahko uporabljate, razmnoujete\n"
"in razirjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
"niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n"
diff --git a/po/sv.po b/po/sv.po
index bc191b75..8735e981 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,12 +2,12 @@
# Copyright (C) 2001 Free Software Foundation, Inc.
# Thomas Olsson <cid95tho@student1.lu.se>, 1996.
# Daniel Resare <daniel@resare.com>, 1998, 1999, 2000, 2001
-# $Id: sv.po,v 1.20 2001/08/31 00:45:25 alainm Exp $
+# $Id: sv.po,v 1.21 2002/03/13 13:45:56 bero Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5e\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 2001-03-07 00:02-0500\n"
"PO-Revision-Date: 2001-08-23 09:46+02:00\n"
"Last-Translator: Daniel Resare <daniel@resare.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -15,18 +15,18 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/grep.c:944 src/search.c:706
msgid "Memory exhausted"
msgstr "Minnet slut"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:486 src/dfa.c:489 src/dfa.c:507 src/dfa.c:518 src/dfa.c:542
+#: src/dfa.c:601 src/dfa.c:606 src/dfa.c:619 src/dfa.c:620 src/dfa.c:998
+#: src/dfa.c:1001 src/dfa.c:1025 src/dfa.c:1029 src/dfa.c:1030 src/dfa.c:1033
+#: src/dfa.c:1045 src/dfa.c:1046
msgid "Unbalanced ["
msgstr "Obalanserad ["
-#: src/dfa.c:741
+#: src/dfa.c:738
msgid "Unfinished \\ escape"
msgstr "Oavslutad \\-sekvens"
@@ -34,32 +34,32 @@ msgstr "Oavslutad \\-sekvens"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:871 src/dfa.c:877 src/dfa.c:887 src/dfa.c:895 src/dfa.c:910
msgid "unfinished repeat count"
msgstr "oavslutad repetitionsrknare"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:884 src/dfa.c:901 src/dfa.c:909 src/dfa.c:913
msgid "malformed repeat count"
msgstr "felformaterad repetionsrknare"
-#: src/dfa.c:1239
+#: src/dfa.c:1232
msgid "Unbalanced ("
msgstr "Obalanserad ("
-#: src/dfa.c:1364
+#: src/dfa.c:1357
msgid "No syntax specified"
msgstr "Ingen specificerad syntax"
-#: src/dfa.c:1372
+#: src/dfa.c:1365
msgid "Unbalanced )"
msgstr "Obalanserad )"
-#: src/dfa.c:2942
+#: src/dfa.c:2933
msgid "out of memory"
msgstr "minnet slut"
-#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103
-#: src/search.c:209 src/search.c:293
+#: lib/obstack.c:471 src/grep.c:343 src/kwset.c:171 src/kwset.c:177
+#: src/search.c:103 src/search.c:223 src/search.c:307
msgid "memory exhausted"
msgstr "minnet slut"
@@ -67,48 +67,48 @@ msgstr "minnet slut"
msgid "invalid context length argument"
msgstr "ogiltigt argument till -A, -B eller -C"
-#: src/grep.c:458
+#: src/grep.c:466
msgid "input is too large to count"
msgstr "det r fr mycket indata fr att rkna"
-#: src/grep.c:531
+#: src/grep.c:539
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:804
+#: src/grep.c:812
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binr fil %s matchar\n"
-#: src/grep.c:818
+#: src/grep.c:826
msgid "(standard input)"
msgstr "(standard in)"
-#: src/grep.c:923
+#: src/grep.c:931
#, c-format
msgid "warning: %s: %s\n"
msgstr "varning: %s: %s\n"
-#: src/grep.c:924
+#: src/grep.c:932
msgid "recursive directory loop"
msgstr "rekursiv katalogloop"
-#: src/grep.c:972
+#: src/grep.c:980
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Anvndning: %s [FLAGGA]... MNSTER [FIL]...\n"
-#: src/grep.c:974
+#: src/grep.c:982
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Frsk med \"%s --help\" fr mer information\n"
-#: src/grep.c:979
+#: src/grep.c:987
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Anvndning: %s [FLAGGA]... MNSTER [FIL]...\n"
-#: src/grep.c:980
+#: src/grep.c:988
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Val och tolkning av reguljra uttryck:\n"
-#: src/grep.c:985
+#: src/grep.c:993
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -129,12 +129,11 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp MNSTER r ett utkat reguljrt uttryck\n"
-" -F, --fixed-strings MNSTER r ett antal strngar separerade med "
-"nyrad\n"
+" -F, --fixed-strings MNSTER r ett antal strngar separerade med nyrad\n"
" -G, --basic-regexp MNSTER r ett enkelt reguljrt uttryck\n"
" -P, --perl-regexp MNSTER r ett reguljrt uttryck som i Perl\n"
-#: src/grep.c:990
+#: src/grep.c:998
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -151,7 +150,7 @@ msgstr ""
" -z, --null-data en rad indata begrnsas av en nolltecken, inte\n"
" av ett nyrad-tecken\n"
-#: src/grep.c:997
+#: src/grep.c:1005
msgid ""
"\n"
"Miscellaneous:\n"
@@ -170,8 +169,7 @@ msgstr ""
" --mmap anvnd om mjligt minesmappning vid\n"
" lsning av indata.\n"
-#: src/grep.c:1005
-#, fuzzy
+#: src/grep.c:1013
msgid ""
"\n"
"Output control:\n"
@@ -189,10 +187,9 @@ msgid ""
" -d, --directories=ACTION how to handle directories\n"
" ACTION is 'read', 'recurse', or 'skip'\n"
" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be "
-"skipped.\n"
+" --include=PATTERN files that match PATTERN will be examine\n"
+" --exclude=PATTERN files that match PATTERN will be skip.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skip.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -208,8 +205,7 @@ msgstr ""
" -h, --no-filename skriv inte filnamn vid varje visad rad\n"
" -q, --quiet, --silent undvik all normal utskrift\n"
" --binary-files=TYP antag att binra filer r av TYP\n"
-" TYP r \"binary\", \"text\" eller "
-"\"without-match\"\n"
+" TYP r \"binary\", \"text\" eller \"without-match\"\n"
" -a, --text motsvarar --binary-files=text\n"
" -I motsvarar --binary-files=without-match\n"
" -d, --directories=TGRD hur kataloger skall hanteras\n"
@@ -220,11 +216,10 @@ msgstr ""
" --exclude-from=FIL filer som matchar mnster i FIL hoppas ver\n"
" -L, --files-without-match skriv bara ut FILnamn utan trffar\n"
" -l, --files-with-matches skriv bara ut FILnamn med trffar\n"
-" -c, --count skriv fr varje FIL bara ut antal trffade "
-"rader\n"
+" -c, --count skriv fr varje FIL bara ut antal trffade rader\n"
" -Z, --null skriv 0-byte efter FILnamn\n"
-#: src/grep.c:1029
+#: src/grep.c:1037
msgid ""
"\n"
"Context control:\n"
@@ -256,41 +251,39 @@ msgstr ""
"tv FILer r angivna, stts flaggan -h. Programmet returnerar 0 om ngot\n"
"matchar, 1 om inget matchade och 2 om ngot fel uppsttt.\n"
-#: src/grep.c:1044
-msgid ""
-"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1052
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Rapportera buggar till <bug-gnu-utils@gnu.org>.\n"
"Skicka anmrkningar p versttningar till <sv@li.org>\n"
-#: src/grep.c:1054
+#: src/grep.c:1062
msgid "conflicting matchers specified"
msgstr "motstridiga skstrngar specificerade"
-#: src/grep.c:1347
+#: src/grep.c:1355
msgid "unknown directories method"
msgstr "oknd metod gllande kataloger"
-#: src/grep.c:1414
+#: src/grep.c:1422
msgid "invalid max count"
msgstr "ogiltigt vrde fr antal trffar"
-#: src/grep.c:1464
+#: src/grep.c:1472
msgid "unknown binary-files type"
msgstr "oknd binrfiltyp"
-#: src/grep.c:1535
+#: src/grep.c:1543
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1537
+#: src/grep.c:1545
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1539
+#: src/grep.c:1547
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"
@@ -299,11 +292,11 @@ msgstr ""
"finns INGEN garanti, inte ens fr SLJBARHET eller LMPLIGHET FR NGOT\n"
"SPECIELLT NDAML.\n"
-#: src/search.c:606
+#: src/search.c:623
msgid "The -P option is not supported"
msgstr "Flaggan -P stds inte"
-#: src/search.c:619
+#: src/search.c:636
msgid "The -P and -z options cannot be combined"
msgstr "Flaggorna -P och -z kan inte kombineras"
@@ -388,10 +381,10 @@ msgstr "%s: flaggan \"-W %s\" tillter inget argument\n"
#. 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.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:265
msgid "`"
msgstr "\""
-#: lib/quotearg.c:260
+#: lib/quotearg.c:266
msgid "'"
msgstr "\""
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 00000000..ffe750dc
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,396 @@
+# Turkish translations for GNU grep messages.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Nilgün Belma Bugüner <nilgun@fide.org>, 2001, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grep 2.5g\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
+"PO-Revision-Date: 2002-03-07 03:44+0200\n"
+"Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
+"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\n"
+
+#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+msgid "Memory exhausted"
+msgstr "Bellek tükendi"
+
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
+msgid "Unbalanced ["
+msgstr "Karşılıksız ["
+
+#: src/dfa.c:741
+msgid "Unfinished \\ escape"
+msgstr "Tamamlanmamış \\ öncelemi"
+
+#. Cases:
+#. {M} - exact count
+#. {M,} - minimum count, maximum is infinity
+#. {M,N} - M through N
+#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+msgid "unfinished repeat count"
+msgstr "Tamamlanmamış tekrar sayısı"
+
+#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+msgid "malformed repeat count"
+msgstr "Tekrar sayısı hatalı"
+
+#: src/dfa.c:1253
+msgid "Unbalanced ("
+msgstr "Karşılıksız ("
+
+#: src/dfa.c:1378
+msgid "No syntax specified"
+msgstr "Sözdizimi belirtilmemiş"
+
+#: src/dfa.c:1386
+msgid "Unbalanced )"
+msgstr "Karşılıksız )"
+
+#: src/dfa.c:2956
+msgid "out of memory"
+msgstr "bellek yetersiz"
+
+#: lib/obstack.c:471 src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
+msgid "memory exhausted"
+msgstr "bellek tükendi"
+
+#: src/grep.c:205
+msgid "invalid context length argument"
+msgstr "bağlam uzunluk değeri geçersiz"
+
+#: src/grep.c:475
+msgid "input is too large to count"
+msgstr "girdi sayılamayacak kadar büyük"
+
+#: src/grep.c:597
+msgid "writing output"
+msgstr "çıktıyı yazıyor"
+
+#: src/grep.c:870
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr "İkilik dosya %s eşleşir\n"
+
+#: src/grep.c:884
+msgid "(standard input)"
+msgstr "(standart girdi)"
+
+#: src/grep.c:989
+#, c-format
+msgid "warning: %s: %s\n"
+msgstr "uyarı: %s: %s\n"
+
+#: src/grep.c:990
+msgid "recursive directory loop"
+msgstr "ardışık dizin çevrimi"
+
+#: src/grep.c:1038
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "Kullanımı: %s [SEÇENEK]... MASKE [DOSYA]...\n"
+
+#: src/grep.c:1040
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
+
+#: src/grep.c:1045
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+msgstr "Kullanımı: %s [SEÇENEK]... KALIP [DOSYA] ...\n"
+
+#: src/grep.c:1046
+#, c-format
+msgid ""
+"Search for PATTERN in each FILE or standard input.\n"
+"Example: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Regexp selection and interpretation:\n"
+msgstr ""
+"Standart girdi ya da her DOSYA içinde KALIP için arama yapar.\n"
+"Örneğin: %s -i 'merhaba dunya' menu.h main.c\n"
+"\n"
+"Düzenli ifade seçimi ve yorumlanması:\n"
+
+#: src/grep.c:1051
+msgid ""
+" -E, --extended-regexp PATTERN is an extended regular expression\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression\n"
+" -P, --perl-regexp PATTERN is a Perl regular expression\n"
+msgstr ""
+" -E, --extended-regexp KALIP bir genişletilmiş düzenli ifadedir\n"
+" -F, --fixed-strings KALIP satır satır ayrılmış bir dizgedir\n"
+" -G, --basic-regexp KALIP bir temel düzenli ifadedir\n"
+" -P, --perl-regexp KALIP bir Perl düzenli ifadesidir\n"
+
+#: src/grep.c:1056
+msgid ""
+" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -f, --file=FILE obtain PATTERN from FILE\n"
+" -i, --ignore-case ignore case distinctions\n"
+" -w, --word-regexp force PATTERN to match only whole words\n"
+" -x, --line-regexp force PATTERN to match only whole lines\n"
+" -z, --null-data a data line ends in 0 byte, not newline\n"
+msgstr ""
+" -e, --regexp=KALIP KALIP bir düzenli ifade olarak kullanılır\n"
+" -f, --file=DOSYA KALIP DOSYA dan alınır\n"
+" -i, --ignore-case harf büyüklüklerini bir ayrım olarak görmez\n"
+" -w, --word-regexp KALIP bir deyim olarak ele alınır\n"
+" -x, --line-regexp KALIP bir bütün satır olarak ele alınır\n"
+" -z, --null-data satır sonu içermeyen 0 baytlık satır\n"
+
+#: src/grep.c:1063
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --invert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
+msgstr ""
+"\n"
+"Çeşitli:\n"
+" -s, --no-messages hata iletileri gösterilmez\n"
+" -v, --invert-match eşleşmeyen satırlar seçilir\n"
+" -V, --version sürümü gösterir ve çıkar\n"
+" --help bu iletileri gösterir ve çıkar\n"
+" --mmap mümkünse bellek-eşlemli girdi kullanılır\n"
+
+#: src/grep.c:1071
+msgid ""
+"\n"
+"Output control:\n"
+" -m, --max-count=NUM stop after NUM matches\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" --line-buffered flush output on every line\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" --binary-files=TYPE assume that binary files are TYPE\n"
+" TYPE is 'binary', 'text', or 'without-match'\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
+" -d, --directories=ACTION how to handle directories\n"
+" ACTION is 'read', 'recurse', or 'skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
+" ACTION is 'read' or 'skip'\n"
+" -R, -r, --recursive equivalent to --directories=recurse\n"
+" --include=PATTERN files that match PATTERN will be examined\n"
+" --exclude=PATTERN files that match PATTERN will be skipped.\n"
+" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
+" -L, --files-without-match only print FILE names containing no match\n"
+" -l, --files-with-matches only print FILE names containing matches\n"
+" -c, --count only print a count of matching lines per FILE\n"
+" -Z, --null print 0 byte after FILE name\n"
+msgstr ""
+"\n"
+"Çıktı denetimi:\n"
+" -m, --max-count=SAYI SAYI eşleşmeden sonra durur\n"
+" -b, --byte-offset çıktı satırlarında bayt adresi de gösterilir\n"
+" -n, --line-number çıktı satırlarında satır no.ları da gösterilir\n"
+" --line-buffered her satırda tüm çıktı gösterilir\n"
+" -H, --with-filename her eşleşmede dosya ismi de gösterilir\n"
+" -h, --no-filename dosya ismi gösterilmez\n"
+" --label=ETİKET standar girdi dosyası olarak ETİKET gösterirlir\n"
+" -o, --only-matching sadece satırın KALIPla eşleşen bölümü gösterilir\n"
+" -q, --quiet, --silent çıktı verilmez\n"
+" --binary-files=TÜR ikilik dosyalar TÜR türünde varsayılır\n"
+" TÜR: 'binary', 'text', ya da 'without-match'\n"
+" -a, --text --binary-files=text ile aynı\n"
+" -I --binary-files=without-match ile aynı\n"
+" -d, --directories=EYLEM dizinlerin ele alınma şekli\n"
+" EYLEM: 'read', 'recurse', ya da 'skip'\n"
+" -D, --devices=EYLEM aygıtların ele alınma şekli, FIFO ve soketler\n"
+" için EYLEM: 'read' ya da 'skip'\n"
+" -R, -r, --recursive --directories=recurse ile aynı (ardışık)\n"
+" --include=KALIP KALIP ile eşleşen dosyalar gösterilir\n"
+" --exclude=KALIP KALIP ile eşleşen dosyalar atlanır\n"
+" --exclude-from=DOSYA DOSYA içindeki dosyalardan KALIP ile eşleşenler atlanır.\n"
+" -L, --files-without-match sadece eşleşmeyen DOSYA isimleri gösterilir\n"
+" -l, --files-with-matches sadece eşleşen DOSYA isimleri gösterilir\n"
+" -c, --count her DOSYAdaki eşleşen satır sayısı gösterilir\n"
+" -Z, --null DOSYA isminin arkasına null ekler\n"
+
+#: src/grep.c:1099
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context=NUM print NUM lines of output context\n"
+" -NUM same as --context=NUM\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to distinguish the matching string\n"
+" WHEN may be `always', `never' or `auto'.\n"
+" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
+" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
+"\n"
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
+"and 2 if trouble.\n"
+msgstr ""
+"\n"
+"Bağlamsal denetim:\n"
+" -B, --before-context=SAYI bağlamdan önceki SAYI satır gösterilir\n"
+" -A, --after-context=SAYI bağlamdan sonraki SAYI satır gösterilir\n"
+" -C, --context=SAYI çıktı olarak SAYI satır gösterilir\n"
+" -SAYI --context=SAYI ile aynı\n"
+" --color[=SÜREÇ],\n"
+" --colour[=SÜREÇ] eşleşen dizgeleri ayırt etmede renk kullanılır\n"
+" SÜREÇ: daima 'always', hiç 'never', 'auto' -U, --binary satır sonlarındaki satırbaşı (CR) karakterlerini\n"
+" kaldırmaz\n"
+" -u, --unix-byte-offsets satırbaşı karakterlerine bakmaz\n"
+"\n"
+"`egrep' ile `grep -E', `fgrep' ile `grep -F' aynı işi yapar.\n"
+"DOSYA verilmeksizin ya da yerine - verilirse standart girdi okunur.\n"
+"İki DOSYAdan az verilmişse -h varsayılır.\n"
+"Çıkışta durum eşleşme varsa 0, yoksa 1, belirsizlik varsa 2 dir.\n"
+
+#: src/grep.c:1116
+msgid ""
+"\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr ""
+"\n"
+"Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine bildirin.\n"
+
+#: src/grep.c:1126
+msgid "conflicting matchers specified"
+msgstr "birbiriyle çatışan eşleştiriciler belirtildi"
+
+#: src/grep.c:1363
+msgid "unknown devices method"
+msgstr "bilinmeyen aygıt yöntemi"
+
+#: src/grep.c:1430
+msgid "unknown directories method"
+msgstr "bilinmeyen dizin yöntemi"
+
+#: src/grep.c:1497
+msgid "invalid max count"
+msgstr "en çok miktarı geçersiz"
+
+#: src/grep.c:1551
+msgid "unknown binary-files type"
+msgstr "bilinmeyen ikilik dosya türü"
+
+#: src/grep.c:1646
+#, c-format
+msgid "%s (GNU grep) %s\n"
+msgstr "%s (GNU grep) %s\n"
+
+#: src/grep.c:1648
+msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr "Telif Hakkı 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:1650
+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 serbest yazılımdır; kopyalama koşulları için kaynak koduna bakınız.\n"
+"Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
+"UYGUNLUĞU için bile garanti verilmez.\n"
+
+#: src/search.c:606
+msgid "The -P option is not supported"
+msgstr "-P seçeneği desteklenmiyor"
+
+#: src/search.c:619
+msgid "The -P and -z options cannot be combined"
+msgstr "-P ve -z seçenekleri birlikte olamaz"
+
+#: lib/error.c:117
+msgid "Unknown system error"
+msgstr "Bilinmeyen sistem hatası"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' seçeneği belirsiz\n"
+
+#: lib/getopt.c:700
+#, 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:705
+#, 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:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' seçeneği bilinmiyor\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: geçersiz seçenek -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:815 lib/getopt.c:945
+#, 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:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' seçeneği belirsiz\n"
+
+#: lib/getopt.c:880
+#, 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"
+
+#. 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, 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.
+#: lib/quotearg.c:259
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:260
+msgid "'"
+msgstr "'"