summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorTony Abou-Assaleh <taa@acm.org>2009-02-01 03:11:04 +0000
committerTony Abou-Assaleh <taa@acm.org>2009-02-01 03:11:04 +0000
commit5f6b0e4db4d0e4cbf7844b2963fd9ca9a70c6585 (patch)
tree77bc572923e981cf77a76af39b82dac25ef234ae /po
parent7fb766739414b036e7021f96050f92639c082018 (diff)
downloadgrep-5f6b0e4db4d0e4cbf7844b2963fd9ca9a70c6585.tar.gz
* po/*.po: update from the Translation Project
* po/*.po: update from the Translation Project
Diffstat (limited to 'po')
-rw-r--r--po/cs.po209
-rw-r--r--po/eo.po144
-rw-r--r--po/fi.po85
-rw-r--r--po/fr.po533
-rw-r--r--po/ga.po154
-rw-r--r--po/id.po462
-rw-r--r--po/it.po480
-rw-r--r--po/nl.po151
-rw-r--r--po/pl.po325
-rw-r--r--po/pt_BR.po518
-rw-r--r--po/ru.po541
-rw-r--r--po/sk.po155
-rw-r--r--po/sl.po87
-rw-r--r--po/sv.po150
-rw-r--r--po/uk.po2
-rw-r--r--po/vi.po191
16 files changed, 2640 insertions, 1547 deletions
diff --git a/po/cs.po b/po/cs.po
index ae688722..71513f2d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,34 +1,34 @@
# Czech message catalog for grep.
# Copyright (C) 1998 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
# Vladimir Michl <Vladimir.Michl@seznam.cz>, 1998.
+# Petr Pisar <petr.pisar@atlas.cz>, 2008, 2009.
#
# Thanks to: Stanislav Brabec <utx@k332.feld.cvut.cz>
-# Note: There are 2 untranslated messages (quotes) at the end of the file.
-# It is OK, since it is not used anywhere.
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep 2.5.4-pre4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-07 10:54+0100\n"
-"Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-23 08:39+0100\n"
+"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
-msgstr "Pameť vyčerpána"
+msgstr "Paměť vyčerpána"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Lichý počet ["
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Za \\ chybí znak"
@@ -36,29 +36,31 @@ msgstr "Za \\ chybí znak"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "neukončený zápis počtu opakování"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "deformovaný zápis počtu opakování"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Lichý počet ("
# ? Není zadaná syntaxe
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Syntaxe není určena"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Lichý počet )"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "paměť vyčerpána"
@@ -100,13 +102,13 @@ msgstr "Použití: %s [PŘEPÍNAČ]... VZOREK [SOUBOR]...\n"
#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Více informací získáte příkazem `%s --help'.\n"
+msgstr "Více informací získáte příkazem „%s --help“.\n"
#: src/grep.c:1412
#, c-format
msgid "Search for PATTERN in each FILE or standard input.\n"
msgstr ""
-" Hledá řádky, jejichž některé části vyhovují VZORKu. Řádky jsou čteny postupně\n"
+" Hledá řádky, jejichž některé části vyhovují VZORKU. Řádky jsou čteny postupně\n"
"ze všech zadaných SOUBORů nebo ze standardního vstupu.\n"
#: src/grep.c:1415
@@ -179,7 +181,7 @@ msgstr ""
"\n"
"Různé:\n"
" -s, --no-messages potlačí chybové zprávy\n"
-" -v, --invert-match vypíše řádky, které VZORKu nevyhovují\n"
+" -v, --invert-match vypíše řádky, které VZORKU nevyhovují\n"
" -V, --version vypíše označení verze a skončí\n"
" --help vypíše tuto nápovědu a skončí\n"
" --mmap když to jde, namapuje vstup do paměti\n"
@@ -228,18 +230,18 @@ msgstr ""
" -h, --no-filename potlačí vypisování jména souboru s výst. řádkem\n"
" --label=NÁZEV zobrazí NÁZEV jako název souboru na standardním\n"
" vstupu\n"
-" -o, --only-matching zobrazí pouze tu část řádku odpovídající VZORKu\n"
+" -o, --only-matching zobrazí pouze tu část řádku odpovídající VZORKU\n"
" -q, --quiet, --silent potlačí obvyklý výstup\n"
" --binary-files=TYP definuje typ binárních souborů\n"
-" TYP může být: 'binary' (binární), 'text' (textový)\n"
-" nebo 'without-match' (bez vyhovení vzorku)\n"
+" TYP může být: „binary“ (binární), „text“ (textový)\n"
+" nebo „without-match“ (bez vyhovění vzorku)\n"
" -a, --text jako --binary-files=text\n"
" -I jako --binary-files=without-match\n"
" -d, --directories=AKCE jak zpracovávat adresáře. AKCE může být:\n"
-" `read' (číst), `recurse' (rekurze),\n"
-" `skip' (přeskočit)\n"
+" „read“ (číst), „recurse“ (rekurze),\n"
+" „skip“ (přeskočit)\n"
" -D, --devices=AKCE jak zpracovávat zařízení, FIFO (roury) a sockety,\n"
-" AKCE může být: 'read' (číst) nebo 'skip' (přeskočit)\n"
+" AKCE může být: „read“ (číst) nebo „skip“ (přeskočit)\n"
" -R, -r, --recursive jako --directories=recurse\n"
" --include=VZOREK soubory které vyhovují vzorku, budou zpracovány\n"
" --exclude=VZOREK soubory které vyhovují vzorku, budou přeskočeny\n"
@@ -279,8 +281,8 @@ msgstr ""
" -POČET stejné se zadáním --context=POČET\n"
" --color[=KDY],\n"
" --colour[=KDY] použije barev k rozlišení vyhovujících řetězců,\n"
-" KDY může být 'always' (vždy), 'never' (nikdy)\n"
-" nebo 'auto' (automaticky)\n"
+" KDY může být „always“ (vždy), „never“ (nikdy)\n"
+" nebo „auto“ (automaticky)\n"
" -U, --binary neodstraňuje znak CR na konci řádku (MSDOS)\n"
" -u, --unix-byte-offsets vypisuje pozici jako by CR nebyly v souboru (MSDOS\n"
"\n"
@@ -288,12 +290,12 @@ msgstr ""
#: src/grep.c:1495
#, c-format
msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
-msgstr "Spouštění programu jako 'egrep' je zastaralé; použijte 'grep -E'.\n"
+msgstr "Spouštění programu jako „egrep“ je zastaralé; použijte „grep -E“.\n"
#: src/grep.c:1498
#, c-format
msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
-msgstr "Spouštení programu jako 'fgrep' je zastaralé; použijte 'grep -F'.\n"
+msgstr "Spouštění programu jako „fgrep“ je zastaralé; použijte „grep -F“.\n"
#: src/grep.c:1501
#, c-format
@@ -301,8 +303,8 @@ msgid ""
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
msgstr ""
-"'egrep' znamená 'grep -E'. 'fgrep' znamená 'grep -F'.\n"
-"Přímé spustění příkazem 'egrep' nebo 'fgrep' je zastaralé.\n"
+"„egrep“ znamená „grep -E“. „fgrep“ znamená „grep -F“.\n"
+"Přímé spouštění příkazem „egrep“ nebo „fgrep“ je zastaralé.\n"
#: src/grep.c:1505
#, c-format
@@ -334,53 +336,51 @@ msgstr "zadány kolidující vzorky"
#: src/grep.c:1715
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
-msgstr ""
+msgstr "Schopnost „%2$s“ v GREP_COLORS=\"%1$s\" potřebuje hodnotu („=…“); přeskočena."
#: src/grep.c:1719
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
-msgstr ""
+msgstr "Schopnost „%2$s“ v GREP_COLORS=\"%1$s\" je pravdivostního typu a nemůže nést hodnotu („=%3$s“); přeskočena."
#: src/grep.c:1727
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
-msgstr ""
+msgstr "V GREP_COLORS=\"%s\" schopnost „%s“ %s."
#: src/grep.c:1750
#, c-format
msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
-msgstr ""
+msgstr "Zpracování chybně utvořeného GREP_COLORS=\"%s\" zastaveno na zbývajícím podřetězci „%s“."
#: src/grep.c:1883
msgid "unknown devices method"
msgstr "neznámá metoda obsluhy zařízení"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "neznámá metoda obsluhy adresářů"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "neplatný maximální počet"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "neznámý typ binárního souboru"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Toto je volné programové vybavení; podmínky pro kopírování a rozšiřování\n"
-"naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ ZÁRUKY,\n"
-"a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NĚJAKÝ KONKRÉTNÍ ÚČEL.\n"
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Licence GPLv3+: GNU GPL verze 3 nebo novější <http://gnu.org/licenses/gpl.html>\n"
+"Toto je volné programové vybavení: máte právo jej měnit a dále šířit.\n"
+"Není zde ŽÁDNÁ ZÁRUKA, jak jen zákon dovoluje.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -394,41 +394,45 @@ msgstr "Přepínače -P a -z nemohou být kombinovány"
msgid "The -P option only supports a single pattern"
msgstr "Přepínač -P může být použit pouze s jedním vzorkem (na jednom řádku)."
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Neznámá systémová chyba"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "chyba při zápisu"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: přepínač `%s' není jednoznačný\n"
+msgstr "%s: přepínač „%s“ není jednoznačný\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: přepínač `--%s' musí být zadán bez argumentu\n"
+msgstr "%s: přepínač „--%s“ musí být zadán bez argumentu\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: přepínač `%c%s' musí být zadán bez argumentu\n"
+msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: přepínač `%s' vyžaduje argument\n"
+msgstr "%s: přepínač „%s“ vyžaduje argument\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: neznámý přepínač `--%s'\n"
+msgstr "%s: neznámý přepínač „--%s“\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: neznámý přepínač `%c%s'\n"
+msgstr "%s: neznámý přepínač „%c%s“\n"
#. 1003.2 specifies the format of this message.
#: lib/getopt.c:782
@@ -450,12 +454,12 @@ msgstr "%s: přepínač vyžaduje argument -- %c\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: přepínač `-W %s' není jednoznačný\n"
+msgstr "%s: přepínač „-W %s“ není jednoznačný\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: přepínač `-W %s' musí být zadán bez argumentu\n"
+msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n"
#. Get translations for open and closing quotation marks.
#.
@@ -473,8 +477,87 @@ msgstr "%s: přepínač `-W %s' musí být zadán bez argumentu\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr ""
+msgstr "„"
#: lib/quotearg.c:260
msgid "'"
-msgstr ""
+msgstr "“"
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Úspěch"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Žádná shoda"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Neplatný regulární výraz"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Neplatný řadicí znak"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Neplatný název třídy znaků"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Závěrečné koncové lomítko"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Neplatný zpětný odkaz"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Nepárový [ nebo [^"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Nepárový ( nebo \\("
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Nepárový \\{"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Neplatný obsah \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Neplatný konec rozsahu"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Neplatný předchozí regulární výraz"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Předčasný konec regulárního výrazu"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Regulární výraz je příliš velký"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Nepárový ) nebo \\)"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Žádný předchozí regulární výraz"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Copyright © 2008 Free Software Foundation, Inc.\n"
+
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions. There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Toto je volné programové vybavení; podmínky pro kopírování a rozšiřování\n"
+#~ "naleznete ve zdrojových textech. Toto programové vybavení je zcela BEZ ZÁRUKY,\n"
+#~ "a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NĚJAKÝ KONKRÉTNÍ ÚČEL.\n"
diff --git a/po/eo.po b/po/eo.po
index f0564983..6874d7c8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,32 +1,33 @@
# La teksto por la mesaĝoj de la "grep" programo.
# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
# D. Dale Gulledge <dsplat@rochester.rr.com>, 1999.
-# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2000-2007.
+# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2000-2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5.3\n"
+"Project-Id-Version: GNU grep 2.5.4-pre4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-14 15:11+0100\n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-26 21:18+0000\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
msgstr "Memoro elĉerpita"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Senpara ["
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Nefinita \\-eskapo"
@@ -34,28 +35,30 @@ msgstr "Nefinita \\-eskapo"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "nefinita ripetonombro"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "misformita ripetonombro"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Senpara ("
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Mankas sintakso"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Senpara )"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "memoro elĉerpita"
@@ -340,31 +343,30 @@ msgstr "Ĉesis pritrakti malbone formitan GREP_COLORS=\"%s\" ĉe restanta subĉe
msgid "unknown devices method"
msgstr "nekonata metodo por specialaj dosieroj"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "nekonata dosieruja metodo"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "nevalida maksimuma nombro"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "nekonata speco de binara dosiero"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Kopirajto (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Ĉi tiu estas libera programo; vidu la fonton por kopikondiĉoj. Estas\n"
-"NENIA GARANTIO, eĉ ne pri KOMERCA KVALITO aŭ ADEKVATECO POR DIFINITA CELO.\n"
+"Kopirajto (C) %s Free Software Foundation, Inc.\n"
+"Rajtigilo GPLv3+: GNU GPL versio 3 aŭ posta <http://gnu.org/licenses/gpl.html>\n"
+"Ĉi tio estas libera programo: vi estas libera ŝanĝi kaj redistribui ĝin.\n"
+"Estas NENIA GARANTIO, ĝis la grado leĝe permesata.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -378,10 +380,14 @@ msgstr "Ne eblas kombini la opciojn -P kaj -z"
msgid "The -P option only supports a single pattern"
msgstr "La opcio -P akceptas nur unuopan ŝablonon"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Nekonata sistemeraro"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "skriberaro"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -462,3 +468,81 @@ msgstr "'"
#: lib/quotearg.c:260
msgid "'"
msgstr "'"
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Sukceso"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Nenia trafo"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Nevalida regula esprimo"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Nevalida ordiga signo"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Nevalida nomo de signoklaso"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Fina subenstreko"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Nevalida retroreferenco"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Nepara [ aŭ [^"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Nepara ( aŭ \\("
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Nepara \\{"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Nevalida enhavo de \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Nevalida fino de gamo"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Nevalida antaŭa regula esprimo"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Neatendata fino de regula esprimo"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Regula esprimo tro granda"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Nepara ) aŭ \\)"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Mankas antaŭa regula esprimo"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Kopirajto (C) 2008 Free Software Foundation, Inc.\n"
+
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions. There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Ĉi tiu estas libera programo; vidu la fonton por kopikondiĉoj. Estas\n"
+#~ "NENIA GARANTIO, eĉ ne pri KOMERCA KVALITO aŭ ADEKVATECO POR DIFINITA CELO.\n"
diff --git a/po/fi.po b/po/fi.po
index 43222e60..18dcca51 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,35 +1,36 @@
-# translation of grep.pot to Finnish
+# translation of grep-2.5.4-pre3.pot to Finnish
# Finnish translations for GNU grep.
-# Copyright © 2002, 2007 Free Software Foundation, Inc.
+# Copyright © 2002, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
#
# Sami J. Laine <sami.laine@iki.fi>, 2002.
-# Jorma Karvonen <karvjorm@users.sf.net>, 2007.
+# Jorma Karvonen <karvjorm@users.sf.net>, 2007, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep 2.5.4-pre3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-10-23 19:11+0300\n"
+"POT-Creation-Date: 2008-02-09 23:49-0400\n"
+"PO-Revision-Date: 2008-02-10 17:26+0200\n"
"Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"\n"
-"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704
msgid "Memory exhausted"
msgstr "Muisti loppui"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Pariton ["
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Päättymätön \\-ohjausmerkki"
@@ -37,28 +38,28 @@ msgstr "Päättymätön \\-ohjausmerkki"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "päättymätön toistomäärä"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "virheellinen toistomäärä"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Pariton ("
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Syntaksia ei ole määritelty"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Pariton )"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#: lib/obstack.c:471 src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185
+#: src/kwset.c:408 src/search.c:68 src/search.c:225
msgid "memory exhausted"
msgstr "muisti loppui"
@@ -103,22 +104,18 @@ msgid "Try `%s --help' for more information.\n"
msgstr "Katso lisäohjeet valitsimella ”%s --help”.\n"
#: src/grep.c:1412
-#, c-format
msgid "Search for PATTERN in each FILE or standard input.\n"
msgstr "Haetaan HAKULAUSEKEtta jokaisessa TIEDOSTOssa tai vakiosyötteessä.\n"
#: src/grep.c:1415
-#, c-format
msgid "PATTERN is an extended regular expression (ERE).\n"
msgstr "HAKULAUSEKE on laajennettu säännöllinen lauseke (ERE).\n"
#: src/grep.c:1418
-#, c-format
msgid "PATTERN is a set of newline-separated fixed strings.\n"
msgstr "HAKULAUSEKE on rivinvaihdolla eroteltu kiinteä merkkijonojoukko.\n"
#: src/grep.c:1421
-#, c-format
msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
msgstr "HAKULAUSEKE on oletuksena perus-säännöllinen lauseke (BRE).\n"
@@ -134,7 +131,6 @@ msgstr ""
"Säännöllisten lausekkeiden valinta ja tulkinta:\n"
#: src/grep.c:1429
-#, c-format
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
@@ -147,7 +143,6 @@ msgstr ""
" -P, --perl-regexp HAKULAUSEKE on Perl-tyyppinen säännöllinen lauseke\n"
#: src/grep.c:1436
-#, c-format
msgid ""
" -e, --regexp=PATTERN use PATTERN for matching\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -164,7 +159,6 @@ msgstr ""
" -z, --null-data datarivi päättyy nollatavuun, ei rivinvaihtoon\n"
#: src/grep.c:1443
-#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -184,7 +178,6 @@ msgstr ""
" mahdollista\n"
#: src/grep.c:1451
-#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -250,7 +243,6 @@ msgstr ""
" -Z, --null tulosta nollatavu TIEDOSTO-nimen jälkeen\n"
#: src/grep.c:1481
-#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -283,17 +275,14 @@ msgstr ""
"\n"
#: src/grep.c:1495
-#, c-format
msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
msgstr "Kutsuminen ”egrep” käskyllä ei ole enää suositeltavaa, käytä sen sijaan käskyä ”grep -E”.\n"
#: src/grep.c:1498
-#, c-format
msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
msgstr "Kutsuminen ”fgrep” käskyllä ei ole enää suositeltavaa, käytä sen sijaan käskyä ”grep -F”.\n"
#: src/grep.c:1501
-#, c-format
msgid ""
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
@@ -302,7 +291,6 @@ msgstr ""
"Suora kutsuminen ”egrep”- ja ”fgrep”-käskyillä ei ole enää suositeltavaa.\n"
#: src/grep.c:1505
-#, c-format
msgid ""
"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
@@ -321,6 +309,7 @@ msgid ""
msgstr ""
"\n"
"Ilmoita ohjelmistovioista osoitteeseen <%s>.\n"
+"Ilmoita käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
#: src/grep.c:1522
msgid "conflicting matchers specified"
@@ -350,33 +339,31 @@ msgstr "Pysäytettiin vääränmuotoisen kohteen GREP_COLORS=”%s”prosessoint
msgid "unknown devices method"
msgstr "tuntematon laitemetodi"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "tuntematon hakemistometodi"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "virheellinen maksimimäärä"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "tuntematon binääritiedostojen tyyppi"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Tekijänoikeudet © 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
-#, c-format
+msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+msgstr "Tekijänoikeudet © 2008 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:2186
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"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Tämä ohjelma on vapaa ohjelmisto; tarkista jakeluehdot lähdekoodista.\n"
-"Tälle ohjelmalle ei anneta minkäänlaista takuuta; ei edes takuuta\n"
-"kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn\n"
-"tarkoitukseen.\n"
+"Lisenssi GPLv3+: GNU GPL versio 3 tai myöhäisempi <http://gnu.org/licenses/gpl.html>\n"
+"Tämä on vapaa ohjelma: voit vapaasti muuttaa ja jakaa sitä edelleen.\n"
+"Ohjelmalla EI OLE TAKUUTA siinä laajuudessa kuin laki sen sallii.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
diff --git a/po/fr.po b/po/fr.po
index ebb67074..454e609a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,155 +1,161 @@
# Messages franais pour GNU concernant grep.
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
# Michel Robitaille <robitail@IRO.UMontreal.CA>, traducteur depuis/since 1996.
+# Nicolas Provost <nprovost@quadriv.com>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5.1a\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2005-03-06 08:00-0500\n"
-"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
+"Project-Id-Version: GNU grep 2.5.4-pre3\n"
+"POT-Creation-Date: 2008-02-09 23:49-0400\n"
+"PO-Revision-Date: 2008-08-26 21:26+0100\n"
+"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704
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:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
-msgstr "[ non pair"
+msgstr "[ non appari"
-#: src/dfa.c:741
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
-msgstr "squence d'chappement \\ non termine."
+msgstr "Squence d'chappement \\ non termine"
#. 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:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "dcompte de rptition non termin."
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
-msgstr "dcompte de rptition mal form."
+msgstr "dcompte de rptition mal form"
-#: src/dfa.c:1253
+#: src/dfa.c:1306
msgid "Unbalanced ("
-msgstr "( non pair"
+msgstr "( non apparie"
-#: src/dfa.c:1378
+#: src/dfa.c:1431
msgid "No syntax specified"
-msgstr "Aucune syntaxe spcifi"
+msgstr "Aucune syntaxe spcifie"
-#: src/dfa.c:1386
+#: src/dfa.c:1439
msgid "Unbalanced )"
-msgstr ") non pair"
+msgstr ") non apparie"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "Mmoire puise."
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: lib/obstack.c:471 src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185
+#: src/kwset.c:408 src/search.c:68 src/search.c:225
msgid "memory exhausted"
msgstr "Mmoire puise."
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
-msgstr "paramtre de contexte de longueur invalide"
+msgstr "argument de longueur de contexte non valide"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "ce qui est en entre est trop grand pour tre compt"
+msgstr "taille des donnes en entre trop importante pour compter"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
-msgstr "Gnration du rsultat."
+msgstr "gnration du rsultat"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Fichier binaire %s concorde\n"
+msgstr "Fichier binaire %s concordant\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(entre standard)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "AVERTISSEMENT: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr "boucle rcursive sur le rpertoire"
+msgstr "boucle de rpertoire rcursive"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Usage: %s [OPTION]... PATRON [FICHIER]...\n"
+msgstr "Usage: %s [OPTION]... MOTIF [FICHIER]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pour en savoir davantage, faites: %s --help .\n"
-#: src/grep.c:1053
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Usage: %s [OPTION]... PATRON [FICHIER] ...\n"
+#: src/grep.c:1412
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Cherche MOTIF dans chaque FICHIER ou partir de l'entre standard.\n"
+
+#: src/grep.c:1415
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "MOTIF est une expression rgulire tendue\n"
+
+#: src/grep.c:1418
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "MOTIF est un ensemble de chaines fixes spares par des retours chariot.\n"
-#: src/grep.c:1054
+#: src/grep.c:1421
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "MOTIF est, par dfaut, une expression rgulire simple\n"
+
+#: src/grep.c:1424
#, 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 ""
-"Recherche du PATRON dans chaque FICHIER ou sur l'entre standard.\n"
"Exemple: %s -i 'hello world menu.h main.c\n"
"\n"
"Slection et interprtation de l'expression rgulire:\n"
-#: src/grep.c:1059
+#: src/grep.c:1429
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"
+" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression (BRE)\n"
" -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"
-" -G, --basic-regexp PATRON est une expression rgulire de base\n"
-" -P, --perl-regexp PATRON est une expression rgulire en Perl\n"
+" -E, --extended-regexp MOTIF est une expression regulire tendue\n"
+" -F, --fixed-regexp MOTIF est un ensemble chanes fixes spares par des retours chariot\n"
+" -G, --basic-regexp MOTIF est une expression rgulire de base\n"
+" -P, --perl-regexp MOTIF est une expression rgulire en Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1436
msgid ""
-" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -e, --regexp=PATTERN use PATTERN for matching\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=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"
-" -z, --null-data terminer la ligne de donnes par ZRO et\n"
-" non pas par un retour de chariot\n"
-
-#: src/grep.c:1071
+" -e, --regexp=MOTIF utiliser MOTIF comme expression rgulire\n"
+" -f, --file=FICHIER charger le MOTIF depuis ce FICHIER\n"
+" -i, --ignore-case ignorer la distinction de la casse\n"
+" -w, --word-regexp forcer la concordance du MOTIF des mots entiers\n"
+" -x, --line-regexp forcer la concordance du MOTIF des lignes entires\n"
+" -z, --null-data ligne de donnes finissant par 0 et pas par un retour chariot\n"
+
+#: src/grep.c:1443
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,9 +171,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 une table de mmoire en entre si possible\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
msgid ""
"\n"
"Output control:\n"
@@ -180,59 +186,58 @@ msgid ""
" --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"
+" --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"
+" -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"
+" --include=FILE_PATTERN search only files that match FILE_PATTERN\n"
+" --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n"
+" --exclude-from=FILE skip files matching any file pattern from FILE\n"
+" --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n"
+" -L, --files-without-match print only names of FILEs containing no match\n"
+" -l, --files-with-matches print only names of FILEs containing matches\n"
+" -c, --count print only a count of matching lines per FILE\n"
+" -T, --initial-tab make tabs line up (if needed)\n"
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"Contrle de sortie:\n"
-" -m, --max-count=N arrter aprs N concordances\n"
-" -b, --byte-offset afficher les adresses relatives des\n"
-" 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"
-" -a, --text ne pas supprimer la sortie binaire\n"
-" -I quivalent --binary-files=without-match\n"
+" -m, --max-count=N arrter aprs N concordances\n"
+" -b, --byte-offset afficher les dcalages octets avec les lignes sorties\n"
+" -n, --line-number afficher les numros de lignes avec les lignes sorties\n"
+" --line-buffered vider le tampon de sortie aprs chaque ligne\n"
+" -H, --with-filename afficher le nom de fichier pour chaque concordance\n"
+" -h, --no-filename supprimer le nom de fichier sur la sortie\n"
+" --label=L afficher L comme nom de fichier sur l'entre standard\n"
+" -o, --only-matching afficher seulement la partie de ligne concordant avec MOTIF\n"
+" -q, --quiet, --silent supprimer tout affichage normal en sortie\n"
+" --binary-files=T assumer que les fichiers binaires sont de\n"
+" type T, soit binary , text , ou without-match ,\n"
+" -a, --text quivalent --binary-files=text\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"
-" -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"
+" -R, -r, --recursive quivalent --directories=recurse\n"
+" --include=F_MOTIF slectionne les fichiers de nom concordant avec F_MOTIF\n"
+" --exclude=F_MOTIF exclue les fichiers de nom concordant avec F_MOTIF\n"
+" --exclude-from=F exclue les fichiers de nom concordant avec les motifs dans le fichier F\n"
+" --exclude-dir=R_MOTIF exclue les rpertoires de nom concordant avec R_MOTIF.\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"
" contenant des concordances\n"
-" -c, --count afficher seulement le dcompte des lignes\n"
-" concordantes par fichier\n"
-" -Z, --null afficher l'octet ZRO aprs le nom du fichier\n"
+" -c, --count afficher seulement le dcompte des lignes\n"
+" concordantes par fichier\n"
+" -T, --initial-tab make tabs line up\n"
+" -Z, --null mettre l'octet 0 aprs le nom du fichier\n"
-#: src/grep.c:1107
+#: src/grep.c:1481
msgid ""
"\n"
"Context control:\n"
@@ -241,93 +246,127 @@ msgid ""
" -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"
+" --colour[=WHEN] use markers to highlight the matching strings;\n"
+" WHEN is `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"
"Contrle du contexte:\n"
" -B, --before-context=N imprimer N lignes du contexte d'en-tte\n"
-" -A, --after-context=N imprimer N lignes du contexte finale\n"
-" -C, --context[=N] imprimer N lignes (2 par dfaut) du contexte\n"
-" moins que -A ou -B ne soit spcifi\n"
+" -A, --after-context=N imprimer N lignes du contexte final\n"
+" -C, --context[=N] imprimer N lignes du contexte de sortie\n"
" -N identique --context=N\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"
+" --color[=SEL],\n"
+" --colour[=SEL] utiliser des marqueurs pour distinguer les\n"
+" chanes concordantes, SEL valant\n"
+" \"always\", \"never\" ou \"auto\"\n"
+" -U, --binary ne pas enlever les retour chariots CR sur \n"
" les fins de lignes (MS-DOS)\n"
-" -u, --unix-byte-offsets afficher les adresses relatives comme si\n"
+" -u, --unix-byte-offsets afficher les dcalages d'octets comme si\n"
" aucun CR n'tait prsent (MS-DOS)\n"
"\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:1124
+#: src/grep.c:1495
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "L'utilisation de \"egrep\" doit tre abandonne ; utilisez \"grep -E\" la place.\n"
+
+#: src/grep.c:1498
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "L'utilisation de \"fgrep\" doit tre abandonne ; utilisez \"grep -F\" la place.\n"
+
+#: src/grep.c:1501
+msgid ""
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
+msgstr "\"egrep\" quivaut \"grep -E\". \"fgrep\" quivaut \"grep -F\".\n"
+
+#: src/grep.c:1505
+msgid ""
+"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
+"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Sans FICHIER, ou si FICHIER vaut -, lit l'entre standard. Si moins de 2 fichiers\n"
+"sont donns, utilise -h. Code de sortie 0 si une ligne est slectionne, 1 sinon;\n"
+"en cas d'erreur et si l'option -q n'est pas prsente, le code de sortie vaut 2.\n"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Rapporter toutes anomalies <bug-grep@gnu.org>.\n"
+"Rapporter toutes anomalies <%s>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "oprateurs de concordance spcifis en conflit"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "Dans GREP_COLORS=\"%s\", la capacit \"%s\" doit valoir (\"=...\"); ignor."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "Dans GREP_COLORS=\"%s\", la capacit \"%s\" est un boolen et ne peut valoir (\"=%s\"); ignor."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "Dans GREP_COLORS=\"%s\", la capacit \"%s\" %s."
+
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Arrt de l'utilisation de GREP_COLORS=\"%s\" (mal forme), sous-chaine restante \"%s\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
-msgstr "mthode inconnue pour les priphrique"
+msgstr "mthode d'examen des priphriques inconnue"
-#: src/grep.c:1443
+#: src/grep.c:1957
msgid "unknown directories method"
-msgstr "mthode inconnue des rpertoires"
+msgstr "mthode d'examen des rpertoires inconnue"
-#: src/grep.c:1510
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "dcompte maximal invalide."
-#: src/grep.c:1565
+#: src/grep.c:2080
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:1660
-#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (grep de GNU) %s\n"
-
-#: src/grep.c:1662
-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:2184
+msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n"
-#: src/grep.c:1664
+#: src/grep.c:2186
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"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Ce logiciel est libre; voir les sources pour les conditions de\n"
-"reproduction. AUCUNE garantie n'est donne; tant pour des raisons\n"
-"COMMERCIALES que pour RPONDRE UN BESOIN PARTICULIER.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "L'option -P n'est pas supporte."
+"Licence GPLv3+: GNU GPL version 3 ou ultrieure <http://gnu.org/licenses/gpl.html>\n"
+"Logiciel libre : vous tes libre de le modifier ou de le redistribuer.\n"
+"Il n'y a AUCUNE GARANTIE, dans les limites autorises par la loi.\n"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "L'option -P n'est pas supporte par cette librairie compile avec l'option --disable-perl-regexp"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
msgstr "Les options -P et -z ne peuvent tre combines."
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "L'option -P ne supporte qu'un seul motif."
+
#: lib/error.c:117
msgid "Unknown system error"
msgstr "Erreur systme inconnue"
@@ -340,12 +379,12 @@ 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 prend 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 prend pas de paramtre.\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
@@ -389,7 +428,7 @@ 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 prend pas de paramtre.\n"
#. Get translations for open and closing quotation marks.
#.
@@ -407,172 +446,14 @@ msgstr "%s: l'option -W %s ne permet pas de paramtre.\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr "`"
+msgstr "\""
#: lib/quotearg.c:260
msgid "'"
-msgstr "'"
-
-#~ msgid "option %s"
-#~ msgstr "option %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " avec le paramtre %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "Des chiffres apparaissent dans 2 paramtres diffrents.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "option %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "option a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "option b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "option c ayant pour valeur `%s'\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "option d ayant pour valeur `%s'\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt() a retourn le code de caractre 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "Des lment ARGV qui ne sont pas des options: "
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "Mmoire puise.\n"
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "Un seul des paramtres suivants peut tre spcifi -E, -F ou -G"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(entre standard)\n"
-
-#~ 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 " -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"
-
-#~ msgid " -e, --regexp=PATTERN use PATTERN as a regular expression\n"
-#~ msgstr ""
-#~ " -e, --regexp=PATRON utiliser le PATRON comme une \n"
-#~ " expression rgulire\n"
-
-#~ msgid " -f, --file=FILE obtain PATTERN from FILE\n"
-#~ msgstr " -f, --file=FICHIER lire le PATRON partir du FICHIER\n"
-
-#~ 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"
-#~ 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"
-#~ msgstr ""
-#~ " -x, --line-regexp forcer le PATRON tablir des\n"
-#~ " concordances que pour des lignes entires\n"
-
-#~ msgid "Miscellaneous:\n"
-#~ msgstr "Divers:\n"
-
-#~ msgid " -s, --no-messages suppress error messages\n"
-#~ 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"
-
-#~ msgid " -V, --version print version information and exit\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"
-
-#~ msgid "Output control:\n"
-#~ msgstr "Contrle de sortie:\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"
-
-#~ msgid " -n, --line-number print line number with output lines\n"
-#~ msgstr ""
-#~ " -n, --line-number afficher les numros de lignes\n"
-#~ " avec les lignes traites\n"
-
-#~ msgid " -H, --with-filename print the filename for each match\n"
-#~ 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"
-#~ msgstr ""
-#~ " -h, --no-filename supprimer le prfixe du nom de fichier\n"
-#~ " sur la sortie\n"
-
-#~ 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"
-#~ 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"
-#~ 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"
-#~ msgstr ""
-#~ " -c, --count afficher seulement le dcompte des lignes\n"
-#~ " concordantes par fichier\n"
-
-#~ msgid "Context control:\n"
-#~ 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"
-
-#~ msgid " -A, --after-context=NUM print NUM lines of trailing context\n"
-#~ msgstr " -A, --after-context=N imprimer N lignes du contexte finale\n"
-
-#~ msgid " -NUM same as both -B NUM and -A NUM\n"
-#~ msgstr " -NUM identique -B NUM et -A NUM\n"
-
-#~ msgid " -C, --context same as -2\n"
-#~ 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"
-
-#~ 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"
-#~ msgstr "Il ne devrait y avoir qu'un seul PATRON, -e PATRON ou -f FICHIER.\n"
+msgstr "\""
-#~ 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"
+#~ msgid "out of memory"
+#~ msgstr "Mmoire puise."
-#~ msgid "If no -[GEF], then -G is assumed.\n"
-#~ msgstr ""
-#~ "Si aucune des options -[GEF] alors -G est implicite.\n"
-#~ "Si aucune des options -[GEF] n'est utilis, l'option -G est implicite.\n"
+#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+#~ msgstr "Usage: %s [OPTION]... MOTIF [FICHIER] ...\n"
diff --git a/po/ga.po b/po/ga.po
index 66ec0109..0c71a431 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,31 +1,32 @@
# Irish translations for grep.
# Copyright (C) 2003 Free Software Foundation, Inc.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2003, 2007.
+# This file is distributed under the same license as the grep package.
+# Kevin Patrick Scannell <scannell@SLU.EDU>, 2003, 2007, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep 2.5.4-pre4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-04 15:48-0500\n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-24 15:48-0500\n"
"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
msgstr "Cuimhne dithe"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "[ corr"
# FARF - KPS
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Seicheamh alchin \\ gan chrochn"
@@ -33,29 +34,31 @@ msgstr "Seicheamh alchin \\ gan chrochn"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "T lon na hathrite neamhiomln"
# more precisely, "the string indicating the repeat count" is malformed -- KPS
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "T lon na hathrite mchumtha"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "( corr"
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Nor sonraodh aon chomhrir"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr ") corr"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "cuimhne dithe"
@@ -79,7 +82,7 @@ msgstr "Teaghrn comhoirinach sa chomhad dhnrtha %s\n"
#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(ionchur caighdenach)"
+msgstr "(gnth-ionchur)"
#: src/grep.c:1355
#, c-format
@@ -103,7 +106,7 @@ msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fhil.\n"
#: src/grep.c:1412
#, c-format
msgid "Search for PATTERN in each FILE or standard input.\n"
-msgstr "Dan cuardach ar PATRN i ngach COMHAD n san ionchur caighdenach.\n"
+msgstr "Dan cuardach ar PATRN i ngach COMHAD n sa ghnth-ionchur.\n"
#: src/grep.c:1415
#, c-format
@@ -154,7 +157,7 @@ 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=PATRN sid PATRN le haghaidh meaitsela\n"
+" -e, --regexp=PATRN dan cuardach ar PATRN\n"
" -f, --file=COMHAD faigh PATRN as COMHAD\n"
" -i, --ignore-case dan neamhaird de chs na litreacha\n"
" -w, --word-regexp meaitselann PATRN focail iomlna amhin\n"
@@ -223,7 +226,7 @@ msgstr ""
" --line-buffered dan sruthl an aschuir i ndiaidh gach lne\n"
" -H, --with-filename taispein ainm comhaid le lnte comhoirinacha\n"
" -h, --no-filename n taispein ainmneacha comhad\n"
-" --label=LIPAD t LIPAD ainm comhaid don ionchur caighdenach\n"
+" --label=LIPAD sid LIPAD mar ainm ar an ngnth-ionchur\n"
" -o, --only-matching n taispein ach an teaghrn comhoirinach\n"
" -q, --quiet, --silent mch an gnth-aschur\n"
" --binary-files=CINEL glac le comhaid dhnrtha mar CINEL;\n"
@@ -346,32 +349,30 @@ msgstr "Scoireadh phriseil teaghrn mchumtha GREP_COLORS=\"%s\" ag an bhfot
msgid "unknown devices method"
msgstr "modh anaithnid glasanna"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "modh anaithnid comhadlann"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "uasmhid neamhbhail"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "cinel anaithnid de chomhad dnrtha"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Is saorbhogearra an romhchlr seo; fach ar an mbunchd le haghaidh\n"
-"coinnollacha cipela. Nl barnta ar bith ann; go fi nl barnta ann\n"
-"d'INDOLTACHT n FEILINACHT D'FHEIDHM AR LEITH.\n"
+"Cipcheart %s Free Software Foundation, Inc.\n"
+"Ceadnas GPLv3+: GNU GPL leagan 3 n nos nua <http://gnu.org/licenses/gpl.html>\n"
+"Is saorbhogearra seo: ceadatear duit a athr agus a athdhileadh.\n"
+"Nl barnta AR BITH ann, an oiread at ceadaithe de rir dl.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -385,10 +386,14 @@ msgstr "T na roghanna -P agus -z neamh-chomhoirinach le chile"
msgid "The -P option only supports a single pattern"
msgstr "N thacaonn rogha -P ach le patrn aonair"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Earrid anaithnid chrais"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "earrid sa scrobh"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -470,6 +475,85 @@ msgstr "`"
msgid "'"
msgstr "'"
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "D'irigh leis"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Nl a leithid ann"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Slonn ionadaochta neamhbhail"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Carachtar neamhbhail cimheasa"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Ainm neamhbhail ar aicme charachtar"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Clslais chun deiridh"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Cltagairt neamhbhail"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "[ n [^ corr"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "( n \\( corr"
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "\\{ corr"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "bhar neamhbhail idir \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Deireadh raoin neamhbhail"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Is neamhbhail an slonn ionadaochta roimhe seo"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Deireadh an tsloinn gan choinne"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Slonn ionadaochta rmhr"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr ") n \\) corr"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Nl aon slonn ionadaochta roimhe seo"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Copyright 2008 Free Software Foundation, Inc.\n"
+
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions. There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Is saorbhogearra an romhchlr seo; fach ar an mbunchd le haghaidh\n"
+#~ "coinnollacha cipela. Nl barnta ar bith ann; go fi nl barnta ann\n"
+#~ "d'INDOLTACHT n FEILINACHT D'FHEIDHM AR LEITH.\n"
+
#~ msgid "out of memory"
#~ msgstr "cuimhne dithe"
diff --git a/po/id.po b/po/id.po
index a418e2f9..bfbb7c6b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,28 +1,33 @@
-# grep-2.5g (Indonesian).
+# Pesan bahasa indonesia untuk grep
# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Tedi Heriyanto <tedi_h@gmx.net>, 1999, 2000, 2001, 2002
+# This file is distributed under the same license as the grep package.
+# Tedi Heriyanto <tedi_h@gmx.net>, 1999, 2000, 2001, 2002.
+# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5g.id.po\n"
-"POT-Creation-Date: 2002-01-22 14:39+0100\n"
-"PO-Revision-Date: 2002-03-08 16:34GMT+0700\n"
-"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
+"Project-Id-Version: grep 2.5.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-26 02:13-0400\n"
+"PO-Revision-Date: 2009-01-31 17:00+0700\n"
+"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\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
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
-msgstr "Memori habis"
+msgstr "Kehabisan memori"
-#: 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:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "[ tidak seimbang"
-#: src/dfa.c:741
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "escape \\\\ tidak selesai"
@@ -30,122 +35,137 @@ 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:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
-msgstr "perulangan count tidak selesai"
+msgstr "jumlah perulangan tidak selesai"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
-msgstr "perulangan count salah bentuk"
+msgstr "jumlah perulangan salah bentuk"
-#: src/dfa.c:1253
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "( tidak seimbang"
-#: src/dfa.c:1378
+#: src/dfa.c:1431
msgid "No syntax specified"
-msgstr "Tidak ada syntax dispesifikasikan"
+msgstr "Tidak ada sintaks yang dispesifikasikan"
-#: src/dfa.c:1386
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr ") tidak seimbang"
-#: src/dfa.c:2956
-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
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:178 src/kwset.c:186 src/kwset.c:409
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
-msgstr "memori habis"
+msgstr "kehabisan memori"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
-msgstr "argumen panjang konteks tidak valid"
+msgstr "konteks panjang argumen tidak valid"
-#: src/grep.c:475
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "input terlalu besar untuk dihitung"
+msgstr "masukan terlalu besar untuk dihitung"
-#: src/grep.c:597
+#: src/grep.c:927
msgid "writing output"
-msgstr "menulis output"
+msgstr "menulis keluaran"
-#: src/grep.c:870
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "File biner %s cocok\n"
+msgstr "Berkas binari %s cocok\n"
-#: src/grep.c:884
+#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(input standar)"
+msgstr "(standar masukan)"
-#: src/grep.c:989
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "peringatan: %s: %s\n"
-#: src/grep.c:990
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "perulangan direktori rekursif"
-#: src/grep.c:1038
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Pemakaian: %s [OPSI]... POLA [FILE]...\n"
+msgstr "Penggunaan: %s [OPSI]... POLA [BERKAS]...\n"
-#: src/grep.c:1040
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
-#: src/grep.c:1045
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Cari untuk POLA dalam setiap berkas atau standar masukan.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "POLA adalah sebuah ekstensi ekspresi regular (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "POLA adalah sebuah seet dari baris-baru dipisahkan string tetap.\n"
+
+#: src/grep.c:1421
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "POLA adalah, secara baku, sebuah ekspresi regular dasar (BRE).\n"
-#: src/grep.c:1046
+#: src/grep.c:1424
#, 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 ""
-"Mencari POLA dalam setiap FILE atau input standar.\n"
"Contoh: %s -i 'hello world' menu.h main.c\n"
"\n"
"Seleksi dan interpretasi regexp:\n"
-#: src/grep.c:1051
+#: src/grep.c:1429
+#, c-format
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"
+" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression (BRE)\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"
-" -G, --basic-regexp POLA adalah ekspresi reguler dasar\n"
+" -E, --extended-regexp POLA adalah ekstensi ekspresi reguler\n"
+" -F, --fixed-stromg POLA adalah string tetap yang dipisahkan oleh sebuah set baris-baru\n"
+" -G, --basic-regexp POLA adalah ekspresi reguler dasar\n"
" -P, --perl-regexp POLA adalah sebuah ekspresi reguler Perl\n"
-#: src/grep.c:1056
+#: src/grep.c:1436
+#, c-format
msgid ""
-" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -e, --regexp=PATTERN use PATTERN for matching\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=POLA gunakan POLA sebagai ekspresi reguler\n"
-" -f, --file=FILE dapatkan pola dari FILE\n"
-" -i, --ignore-case abaikan perbedaan case\n"
-" -w, --word-regexp paksa POLA hanya cocok dengan keseluruhan kata\n"
-" -x, --line-regexp paksa POLA hanya cocok dengan keseluruhan baris\n"
-" -z, --null-data baris data berakhir dalam 0 byte, bukan newline\n"
+" -e, --regexp=POLA gunakan POLA untuk pencocokan\n"
+" -f, --file=BERKAS dapatkan pola dari BERKAS\n"
+" -i, --ignore-case abaikan perbedaan besar huruf\n"
+" -w, --word-regexp paksa POLA hanya untuk pencocokan dengan keseluruhan kata\n"
+" -x, --line-regexp paksa POLA hanya untuk pencocokan dengan keseluruhan baris\n"
+" -z, --null-data baris data berakhir dalam 0 byte, bukan baris-baru\n"
"\n"
-#: src/grep.c:1063
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -157,13 +177,14 @@ msgid ""
msgstr ""
"\n"
"Lain-lain:\n"
-" -s, --no-messages tiadakan pesan kesalahan\n"
-" -v, --invert-match pilih baris-baris yang tidak sesuai\n"
-" -V, --version tampilkan informasi versi dan keluar\n"
-" --help tampilkan bantuan ini dan keluar\n"
-" --mmap gunakan input memory-mapped bila memungkinkan\n"
+" -s, --no-messages tekan pesan kesalahan\n"
+" -v, --invert-match pilih baris-baris yang tidak sesuai\n"
+" -V, --version tampilkan informasi versi dan keluar\n"
+" --help tampilkan bantuan ini dan keluar\n"
+" --mmap gunakan masukan memory-mapped bila memungkinkan\n"
-#: src/grep.c:1071
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -176,51 +197,56 @@ msgid ""
" --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"
+" --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"
+" -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"
+" --include=FILE_PATTERN search only files that match FILE_PATTERN\n"
+" --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n"
+" --exclude-from=FILE skip files matching any file pattern from FILE\n"
+" --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n"
+" -L, --files-without-match print only names of FILEs containing no match\n"
+" -l, --files-with-matches print only names of FILEs containing matches\n"
+" -c, --count print only a count of matching lines per FILE\n"
+" -T, --initial-tab make tabs line up (if needed)\n"
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
-"Kendali output:\n"
-" -m, --max-count=NUM berhenti setelah cocok sejumlah NUM\n"
-" -b, --byte-offset cetak offset byte dengan baris output\n"
-" -n, --line-number cetak nomor baris dengan baris output\n"
-" --line-buffered flush output setiap baris\n"
-" -H, --with-filename cetak namafile untuk setiap kecocokan\n"
-" -h, --no-filename tiadakan namafile di output\n"
-" --label=LABEL cetak LABEL sebagai nama file input standar\n"
-" -q, --quiet, --silent tiadakan seluruh output normal\n"
-" --binary-files=TYPE asumsikan bahwa file biner bertipe TYPE\n"
-" TYPE adalah 'binary', 'text', atau 'without match'\n"
-" -a, --text ekivalen dengan --binary-files=text\n"
-" -l ekivalen dengan --binary-files=without-match\n"
-" -d, --directories=AKSI bagaimana menangani direktori\n"
+"Kontrol keluaran:\n"
+" -m, --max-count=NUM berhenti setelah cocok sejumlah NUM\n"
+" -b, --byte-offset tampilkan ofset byte dengan baris keluaran\n"
+" -n, --line-number tampilkan nomor baris dengan baris keluaran\n"
+" --line-buffered flush keluaran di setiap baris\n"
+" -H, --with-filename tampilkan nama berkas untuk setiap kecocokan\n"
+" -h, --no-filename tekan mengawali nama berkas di output\n"
+" --label=LABEL tampilkan LABEL sebagai nama berkas standar masukan\n"
+" -o, --only-matching hanya tampilkan bagian dari baris yang cocok dengan POLA\n"
+" -q, --quiet, --silent tekan seluruh keluaran normal\n"
+" --binary-files=TIPE asumsikan bahwa berkas binari adalah TIPE\n"
+" TIPE adalah 'binary', 'text', atau 'without match'\n"
+" -a, --text sama dengan --binary-files=text\n"
+" -l sama dengan --binary-files=without-match\n"
+" -d, --directories=AKSI bagaimana menangani direktori;\n"
" AKSI adalah 'read', 'recurse', atau 'skip'.\n"
" -D, --devices=AKSI bagaimana menangani device, FIFO dan soket\n"
" AKSI adalah 'read' atau 'skip'\n"
-" -R, -r, --recursive ekivalen dengan --directories=recurse.\n"
-" --include=POLA file yang cocok dengan POLA akan diperiksa\n"
-" --exclude=POLA file yang cocok dengan POLA akan dilewati\n"
-" --exclude-from=FILE file yang cocok dengan POLA dalam FILE akan dilewati\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:1099
+" -R, -r, --recursive sama dengan --directories=recurse.\n"
+" --include=POLA_BERKAS cari hanya berkas yang cocok dengan POLA_BERKAS\n"
+" --exclude=POLA_BERKAS lewatkan berkas dan direktori yang cocok dengan POLA_BERKAS\n"
+" --exclude-from=FILE lewatkan berkas yang cocok dengan pola berkas dari FILE\n"
+" -L, --files-without-match hanya menampilkan nama dari BERKAS yang tidak ada kecocokan\n"
+" -l, --files-with-match hanya menampilkan nama dari BERKAS yang ada kecocokan\n"
+" -c, --count hanya menampilkan jumlah baris yang cocok setiap BERKAS\n"
+" -T, --inital-tab buat baris tabs line up (jika diperlukan)\n"
+" -Z, --null menampilkan 0 byte setelah nama BERKAS\n"
+
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -229,90 +255,137 @@ msgid ""
" -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"
+" --colour[=WHEN] use markers to highlight the matching strings;\n"
+" WHEN is `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"
-"Kendali Konteks:\n"
-" -B, --before-context=NUM mencetak NUM baris leading context\n"
-" -A, --after-context=NUM mencetak NUM baris trailing context\n"
-" -C, --context=NUM mencetak NUM baris konteks output \n"
+"Kontrol Konteks:\n"
+" -B, --before-context=NUM menampilkan NUM baris dari konteks yang mengawali\n"
+" -A, --after-context=NUM menampilkan NUM baris dari konteks yang mengakhiri\n"
+" -C, --context=NUM menampilkan NUM baris dari konteks keluaran\n"
" -NUM sama seperti --context=NUM\n"
-" --color[=WHEN],\n"
-" --colour[=WHEN] gunakan penanda untuk membedakan string yang cocok\n"
-" WHEN dapat berupa 'always', 'never', atau 'auto'\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] gunakan penanda untuk membedakan string yang cocok\n"
+" WHEN dapat berupa 'always', 'never', atau 'auto'\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 ofset seperti bila CR tidak ada (MSDOS)\n"
"\n"
+
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Pemanggilan sebagai `egrep' sudah ditinggalkan; lebih baik gunakan `grep -E'.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "pemanggilan sebagai `fgrep' sudah ditinggalkan; lebih baik gunakan `grep -F'.\n"
+
+#: src/grep.c:1501
+#, c-format
+msgid ""
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
+msgstr ""
"`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"
-"tidak. 2 jika terjadi masalah.\n"
+"Pemanggilan langsung baik sebagai `egrep' atau `fgrep' sudah ditinggalkan.\n"
+
+#: src/grep.c:1505
+#, c-format
+msgid ""
+"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
+"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Jika tidak ada BERKAS, atau ketika BERKAS adalah -, baca standar masukan. Jika lebih kecil dari dua BERKAS\n"
+"yang diberikan, asumsikan -h. Status keluar adalah 0 jika baris apapun telah dipilih, 1 jika tidak;\n"
+"jika ada error apapun yang terjadi dan opsi -q tidak diberikan, status keluar adalah 2.\n"
-#: src/grep.c:1116
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
+"Laporkan bugs ke <%s>.\n"
-#: src/grep.c:1126
+#: src/grep.c:1522
msgid "conflicting matchers specified"
-msgstr "dispesifikasikan matcher yang konflik"
+msgstr "konflik pencocokan dispesifikasikan"
+
+#: src/grep.c:1716
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "Dalam GREP_COLORS=\"%s\", kapasitas \"%s\" membutuhkan sebuah nilai (\"=...\"); dilewatkan."
+
+#: src/grep.c:1720
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "Dalam GREP_COLORS=\"%s\", kapasitas \"%s\" adalah boolean dan tidak dapat mengambil sebuah nilai (\"=%s\"); dilewatkan"
-#: src/grep.c:1363
+#: src/grep.c:1729
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "Dalam GREP_COLORS=\"%s\", kapasitas \"%s\" adalah %s."
+
+#: src/grep.c:1752
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Berhenti pemrosesan dari berbentuk-buruk GREP_COLORS=\"%s\" di substring yang tersisa \"%s\"."
+
+#: src/grep.c:1885
msgid "unknown devices method"
msgstr "metode device tidak dikenal"
-#: src/grep.c:1430
+#: src/grep.c:1959
msgid "unknown directories method"
msgstr "metode direktori tidak dikenal"
-#: src/grep.c:1497
+#: src/grep.c:2027
msgid "invalid max count"
-msgstr "jumlah max tidak valid"
+msgstr "jumlah maksimal tidak valid"
-#: src/grep.c:1551
+#: src/grep.c:2082
msgid "unknown binary-files type"
-msgstr "tipe file biner tidak dikenal"
+msgstr "tipe berkas binari tidak dikenal"
-#: src/grep.c:1646
+#: src/grep.c:2186
#, 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 "Hak Cipta (C) 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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
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 "Option -P tidak didukung"
+"Hak Cipta (C) %s Free Software Foundation, Inc.\n"
+"Lisensi GPLv3+; GNU GPL versi 3 atau lebih lanjut <http://gnu.org/licenses/gpl.html>\n"
+"Ini adalah aplikasi bebas; anda bebas untuk mengubah dan meredistribusikannya.\n"
+"TIDAK ADA GARANSI disini, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Dukungan untuk opsi -P tidak dikompile kedalam ini --disable-perl-regexp binari"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "Option -P dan -z tidak dapat digabungkan"
+msgstr "Opsi -P dan -z tidak dapat digabungkan"
-#: lib/error.c:117
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Opsi -P hanya mendukung sebuah pola tunggal"
+
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Kesalahan sistem tidak dikenal"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "penulisan error"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -393,3 +466,90 @@ msgstr "`"
#: lib/quotearg.c:260
msgid "'"
msgstr "'"
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Sukses"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Tidak cocok"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Ekspresi umum tidak valid"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Karakter kolasi tidak valid"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Nama kelas karakter tidak valid"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Kelebihan backslash"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Referensi balik tidak valid"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Tidak cocok [ atau [^"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Tidak cocok ( atau \\("
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Tidak cocok \\{"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Isi dari \\{\\} tidak valid"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Akhir jangkauan tidak valid"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Ekspresi umum yang mengawali tidak valid"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Akhir dari ekspresi umum tidak sempurna"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Ekspresi umum terlalu besar"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Tidak cocok ) atau \\)"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Tidak ada ekspresi umum sebelumnya"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Hak Cipta (C) 2008 Free Software Foundation, Inc.\n"
+
+#~ msgid "out of memory"
+#~ msgstr "memori habis"
+
+#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+#~ msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
+
+#~ msgid "%s (GNU grep) %s\n"
+#~ msgstr "%s (GNU grep) %s\n"
+
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions. There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Ini adalah free software; lihat sumber untuk syarat penyalinan. Tidak ada\n"
+#~ "jaminan; sekalipun untuk PENJUALAN atau KESESUAIAN UNTUK TUJUAN TERTENTU.\n"
diff --git a/po/it.po b/po/it.po
index a38d6e6c..84ba715c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,30 +1,34 @@
-# traduzione di grep
-# Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+# Italian translation of grep
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
+#
# Marco d'Itri <md@linux.it>, 1999, 2001.
+# Milo Casagrande <milo@casagrande.name>, 2008, 2009
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.1a\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2005-03-03 17:37+0100\n"
-"Last-Translator: Marco d'Itri <md@linux.it>\n"
+"Project-Id-Version: grep-2.5.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-26 02:13-0400\n"
+"PO-Revision-Date: 2009-01-30 18:22+0100\n"
+"Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
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:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "[ non bilanciata"
-#: src/dfa.c:741
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Escape \\ incompleto"
@@ -32,123 +36,137 @@ msgstr "Escape \\ incompleto"
#. {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:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
-msgstr "numero di ripetizioni incompleto"
+msgstr "conteggio ripetizioni incompleto"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
-msgstr "numero di ripetizioni malformato"
+msgstr "conteggio ripetizioni malformato"
-#: src/dfa.c:1253
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "( non bilanciata"
-#: src/dfa.c:1378
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Nessuna sintassi specificata"
-#: src/dfa.c:1386
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr ") non bilanciata"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "memoria esaurita"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:178 src/kwset.c:186 src/kwset.c:409
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "memoria esaurita"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "argomento della lunghezza del contesto non valido"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "l'input troppo grande per essere contato"
+msgstr "l'input è troppo grande per essere contato"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
msgstr "scrittura dell'output"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
msgstr "Il file binario %s corrisponde\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(standard input)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "attenzione: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr "loop ricorsivo di directory"
+msgstr "ciclo ricorsivo di directory"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [OPZIONE]... MODELLO [FILE]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Usare `%s --help' per ulteriori informazioni.\n"
+msgstr "Usare \"%s --help\" per ulteriori informazioni.\n"
+
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Cerca il MODELLO in ogni FILE o nello standard input.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "MODELLO è un'espressione regolare estesa (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "MODELLO è un insieme di stringhe letterali separate da newline.\n"
-#: src/grep.c:1053
+#: src/grep.c:1421
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Uso: %s [OPZIONE]... MODELLO [FILE] ...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "MODELLO è, in modo predefinito, un'espressione regolare di base (BRE).\n"
-#: src/grep.c:1054
+#: src/grep.c:1424
#, 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 il MODELLO in ogni FILE o nello standard input.\n"
-"Esempio: %s -i 'hello world' menu.h main.c\n"
+"Esempio: %s -i \"ciao mondo\" menu.h main.c\n"
"\n"
-"Selezione ed interpretazione delle regexp:\n"
+"Selezione e interpretazione delle regexp:\n"
-#: src/grep.c:1059
+#: src/grep.c:1429
+#, c-format
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"
+" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression (BRE)\n"
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
-" -E, --extended-regexp il MODELLO una regular expression estesa\n"
-" -F, --fixed-strings il MODELLO un insieme di stringhe separate da\n"
-" newline\n"
-" -G, --basic-regexp il MODELLO una regular expression semplice\n"
-" -P, --perl-regexp il MODELLO una regular expression del perl\n"
+" -E, --extended-regexp MODELLO è un'espressione regolare estesa\n"
+" -F, --fixed-strings MODELLO è un insieme di stringhe letterali separate da newline\n"
+" -G, --basic-regexp MODELLO è un'espressione regolare semplice\n"
+" -P, --perl-regexp MODELLO è un'espressione regolare Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1436
+#, c-format
msgid ""
-" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -e, --regexp=PATTERN use PATTERN for matching\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=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:1071
+" -e, --regexp=MODELLO Usa MODELLO per la corrispondenza\n"
+" -f, --file=FILE Ottiene 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 il byte 0 invece che\n"
+" newline\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -160,13 +178,14 @@ msgid ""
msgstr ""
"\n"
"Varie:\n"
-" -s, --no-messages elimina i messaggi di errore\n"
-" -v, --invert-match seleziona le righe che non corrispondono\n"
-" -V, --version stampa le informazioni sulla versione ed esce\n"
-" --help mostra questo aiuto ed esce\n"
-" --mmap se possibile mappa in memoria l'input\n"
+" -s, --no-messages Elimina i messaggi di errore\n"
+" -v, --invert-match Seleziona le righe che non corrispondono\n"
+" -V, --version Stampa la versione ed esce\n"
+" --help Visualizza questo aiuto ed esce\n"
+" --mmap Se possibile mappa l'input nella memoria\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -179,53 +198,60 @@ msgid ""
" --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"
+" --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"
+" -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"
+" --include=FILE_PATTERN search only files that match FILE_PATTERN\n"
+" --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n"
+" --exclude-from=FILE skip files matching any file pattern from FILE\n"
+" --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n"
+" -L, --files-without-match print only names of FILEs containing no match\n"
+" -l, --files-with-matches print only names of FILEs containing matches\n"
+" -c, --count print only a count of matching lines per FILE\n"
+" -T, --initial-tab make tabs line up (if needed)\n"
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
"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"
-" --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"
+" -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"
+" --line-buffered Fa il flush dell'output con 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=ETICH Stampa ETICH al posto del nome del file per lo standard\n"
+" input\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"
-" '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"
-" '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"
-" -Z, --null stampa il byte 0 dopo ogni nome di FILE\n"
-
-#: src/grep.c:1107
+" -q, --quiet, --silent Elimina tutto l'output normale\n"
+" --binary-files=TIPO Suppone che i file binari siano del TIPO \"binary\",\n"
+" \"text\" oppure \"without-match\"\n"
+" -a, --text Equivale a --binary-files=text\n"
+" -I Equivale a --binary-files=without-match\n"
+" -d, --directories=AZIONE Come gestire le directory: AZIONE è \"read\", \"recurse\"\n"
+" o \"skip\"\n"
+" -D, --devices=AZIONE Come gestire device, FIFO e socket: AZIONE è \"read\"\n"
+" o \"skip\" \n"
+" -R, -r, --recursive Equivale 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"
+" --exclude-dir=MODELLO Salta le directory corrispondenti al MODELLO\n"
+" -L, --files-without-match Stampa solo i nomi dei FILE senza corrispondenze\n"
+" -l, --files-with-matches Stampa solo i nomi dei FILE contenenti corrispondenze\n"
+" -c, --count Stampa solo il conteggio delle righe occorrenti in ogni\n"
+" FILE\n"
+" -T, --initial-tab Allinea le tabulazioni (se necessario)\n"
+" -Z, --null Stampa il byte 0 dopo ogni nome di FILE\n"
+
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -234,131 +260,176 @@ msgid ""
" -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"
+" --colour[=WHEN] use markers to highlight the matching strings;\n"
+" WHEN is `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"
"Controllo del contesto:\n"
-" -B, --before-context=NUM stampa NUM righe di contesto precedente\n"
-" -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"
+" -B, --before-context=NUM Stampa NUM righe di contesto precedente\n"
+" -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[=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"
+" --colour[=QUANDO] Usa i colori per distinguere le stringhe corrispondenti.\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"
"\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"
-"non corrisponde o con 2 se ci sono problemi.\n"
-#: src/grep.c:1124
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "L'invocazione come \"egrep\" è deprecata, usare \"grep -E\".\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "L'invocazione come \"fgrep\" è deprecata, usare \"grep -F\".\n"
+
+#: src/grep.c:1501
+#, c-format
+msgid ""
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
+msgstr ""
+"\"egrep\" significa \"grep -E\", \"fgrep\" significa \"grep -F\".\n"
+"L'invocazione diretta come \"egrep\" o \"fgrep\" è deprecata.\n"
+
+#: src/grep.c:1505
+#, c-format
+msgid ""
+"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
+"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Se non c'è alcun FILE o il FILE è -, legge lo standard input. Se sono stati\n"
+"specificati meno di due FILE presume -h. Esce con lo stato 0 se è stata\n"
+"selezionata almeno una riga, 1 altrimenti. Se si verifica un errore e l'opzione\n"
+"-q non è stata usata, lo stato è 2.\n"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Segnalare i bug a <bug-grep@gnu.org>.\n"
+"Segnalare i bug a <%s>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "specificate corrispondenze in conflitto"
-#: src/grep.c:1376
+#: src/grep.c:1716
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "In GREP_COLORS=\"%s\", la capacità \"%s\" necessita un valore (\"=...\"); saltato."
+
+#: src/grep.c:1720
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "In GREP_COLORS=\"%s\", la capacità \"%s\" è booleana e non può accettare un valore (\"=%s\"); saltato."
+
+# (ndt) ???
+#: src/grep.c:1729
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "In GREP_COLORS=\"%s\", la capacità \"%s\" %s."
+
+#: src/grep.c:1752
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Elaborazione dei GREP_COLORS=\"%s\" mal formati nelle sottostringhe \"%s\" rimanenti fermata."
+
+#: src/grep.c:1885
msgid "unknown devices method"
-msgstr "metodo per i dispositivi sconosciuto"
+msgstr "metodo per i device sconosciuto"
-#: src/grep.c:1443
+#: src/grep.c:1959
msgid "unknown directories method"
msgstr "metodo per le directory sconosciuto"
-#: src/grep.c:1510
+#: src/grep.c:2027
msgid "invalid max count"
msgstr "numero massimo non valido"
-#: src/grep.c:1565
+#: src/grep.c:2082
msgid "unknown binary-files type"
msgstr "tipo di file binario sconosciuto"
-#: src/grep.c:1660
+#: src/grep.c:2186
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (grep GNU) %s\n"
-
-#: src/grep.c:1662
-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:1664
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
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"
-"NON c' garanzia; neppure di COMMERCIABILIT o IDONEIT AD UN PARTICOLARE\n"
-"SCOPO.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "L'opzione -P non gestita"
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Licenza GPLv3+: GNU GPL versione 3 o successive <http://gnu.org/licenses/gpl.html>\n"
+"Questo è software libero: siete liberi di modificarlo e ridistribuirlo.\n"
+"Non c'è ALCUNA GARANZIA, per quanto consentito dalle vigenti normative.\n"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Il supporto all'opzione -P non è compilato in questo binario --disable-perl-regexp"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
msgstr "Le opzioni -P e -z non possono essere combinate"
-#: lib/error.c:117
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "L'opzione -P supporta un solo modello"
+
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Errore di sistema sconosciuto"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "errore di scrittura"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'opzione `%s' ambigua\n"
+msgstr "%s: l'opzione \"%s\" è ambigua\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione `--%s' non accetta argomenti\n"
+msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione `%c%s' non accetta argomenti\n"
+msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'opzione `%s' richiede un argomento\n"
+msgstr "%s: l'opzione \"%s\" richiede un argomento\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opzione `--%s' non riconosciuta\n"
+msgstr "%s: opzione \"--%s\" non riconosciuta\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opzione `%c%s' non riconosciuta\n"
+msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
#. 1003.2 specifies the format of this message.
#: lib/getopt.c:782
#, c-format
msgid "%s: illegal option -- %c\n"
-msgstr "%s: opzione illegale -- %c\n"
+msgstr "%s: opzione non lecita -- %c\n"
#: lib/getopt.c:785
#, c-format
@@ -374,12 +445,12 @@ msgstr "%s: l'opzione richiede un argomento -- %c\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'opzione `-W %s' ambigua\n"
+msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'opzione `-W %s' non accetta argomenti\n"
+msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n"
#. Get translations for open and closing quotation marks.
#.
@@ -397,8 +468,77 @@ msgstr "%s: l'opzione `-W %s' non accetta argomenti\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr "`"
+msgstr "\""
#: lib/quotearg.c:260
msgid "'"
-msgstr "'"
+msgstr "\""
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Successo"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Nessuna corrispondenza"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Espressione regolare non valida"
+
+# (ndt) http://en.wikipedia.org/wiki/Collation
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Carattere di collazione non valido"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Nome classe del carattere non valido"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Backslash finale"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Riferimento all'indietro non valido"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "[ o [^ senza corrispondenza"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "( o \\( senza corrispondenza"
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "\\{ senza corrispondenza"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Contenuto di \\{\\} non valido"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Limite massimo non valido"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Espressione regolare precedente non valida"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Fine prematura dell'espressione regolare"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Espressione regolare troppo grande"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr ") o \\) senza corrispondenza"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Nessuna espressione regolare precedente"
diff --git a/po/nl.po b/po/nl.po
index 5bc9932f..3f27def1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,35 +1,35 @@
-# Translation of grep-2.5.3 to Dutch.
-# Copyright (C) 1996, 2000, 2004, 2005, 2007 Free Software Foundation, Inc.
+# Translation of grep to Dutch.
+# This file is distributed under the same license as the grep package.
+# Copyright (C) 2008 Free Software Foundation, Inc.
+#
# Erick Branderhorst <branderh@debian.org>, 1996.
# Ivo Timmermans <itimmermans@bigfoot.com>, 2000.
# Taco Witte <tcwitte@cs.uu.nl>, 2004.
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2007.
-#
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2007, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep-2.5.4-pre4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-14 11:37+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-23 08:32+0100\n"
+"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
msgstr "Onvoldoende geheugen beschikbaar"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Ongepaarde ["
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Onafgemaakte \\ stuurcode"
@@ -37,28 +37,30 @@ msgstr "Onafgemaakte \\ stuurcode"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "Onafgemaakt herhalingsaantal"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "Onjuist herhalingsaantal"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Ongepaarde ("
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Geen syntax opgegeven"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Ongepaarde )"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "onvoldoende geheugen beschikbaar"
@@ -77,7 +79,7 @@ msgstr "schrijven van uitvoer..."
#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Binair bestand %s komt overeen\n"
+msgstr "Binair bestand %s bevat de gezochte tekst.\n"
#: src/grep.c:1223
msgid "(standard input)"
@@ -358,32 +360,30 @@ msgstr ""
msgid "unknown devices method"
msgstr "Onbekende apparaten-actie"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "Onbekende mappen-actie"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "Ongeldig maximum aantal"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "Onbekend binair bestandstype"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright 1988, 1992-2002, 2004, 2007 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Dit is vrije programmatuur; zie de brontekst voor de kopieervoorwaarden.\n"
-"Er is GEEN garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID\n"
-"VOOR EEN BEPAALD DOEL.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licentie GPLv3+: GNU GPL versie 3 of nieuwer <http://gnu.org/licenses/gpl.html>\n"
+"Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
+"Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -391,16 +391,20 @@ msgstr "Ondersteuning voor de optie '-P' is in deze programmaversie niet opgenom
#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "De opties '-P' en '-z' gaan niet samen"
+msgstr "Opties '-P' en '-z' gaan niet samen"
#: src/search.c:634
msgid "The -P option only supports a single pattern"
msgstr "Optie '-P' accepteert slechts één patroon"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Onbekende systeemfout"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "schrijffout"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -481,3 +485,74 @@ msgstr "‘"
#: lib/quotearg.c:260
msgid "'"
msgstr "’"
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Gelukt"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Geen overeenkomst"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Reguliere expressie is onjuist"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Collatiekarakter is onjuist"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Naam karakterklasse is onjuist"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Afsluitende backslash"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Terugverwijzing is onjuist"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "[ of [^ worden niet gesloten"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "( of \\( worden niet gesloten"
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "\\{ wordt niet gesloten"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} bevat onjuiste inhoud"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Range-einde onjuist"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Voorgaande reguliere expressie is onjuist"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Reguliere expressie kent voortijdig einde"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Reguliere expressie is te groot"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr ") of \\) worden niet geopend"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Geen eerdere reguliere expressie"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n"
diff --git a/po/pl.po b/po/pl.po
index e0791537..e436ecea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,74 +1,79 @@
# Polish translation of the GNU grep messages
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
-# Rafa Maszkowski <rzm@icm.edu.pl>, 1996-2002, 2005, 2007.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
+# Rafał Maszkowski <rzm@icm.edu.pl>, 1996-2002, 2005, 2007-2009.
+#
+# my „smart" mutt needs this line
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5.3\n"
+"Project-Id-Version: GNU grep 2.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-28 18:00+0200\n"
-"Last-Translator: Rafa Maszkowski <rzm@icm.edu.pl>\n"
+"POT-Creation-Date: 2009-01-26 02:13-0400\n"
+"PO-Revision-Date: 2009-01-30 12:30+0100\n"
+"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\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-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
-msgstr "Pami wyczerpana"
+msgstr "Pamięć wyczerpana"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "[ nie do pary"
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
-msgstr "Niedokoczona sekwencja \\"
+msgstr "Niedokończona sekwencja \\"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
-msgstr "niedokoczona liczba powtrze"
+msgstr "niedokończona specyfikacja liczby powtórzeń"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
-msgstr "le sformatowana liczba powtrze"
+msgstr "źle sformatowana specyfikacja liczby powtórzeń"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
-msgstr "Brak specyfikacji skadni"
+msgstr "Brak specyfikacji składni"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:178 src/kwset.c:186 src/kwset.c:409
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
-msgstr "pami wyczerpana"
+msgstr "pamięć wyczerpana"
#: src/grep.c:404
msgid "invalid context length argument"
-msgstr "bdny argument dugoci kontekstowej"
+msgstr "błędny argument długości kontekstowej"
#: src/grep.c:665
msgid "input is too large to count"
-msgstr "danych wejciowych jest zbyt duo do policzenia"
+msgstr "danych wejściowych jest zbyt dużo do policzenia"
#: src/grep.c:927
msgid "writing output"
-msgstr "zapisuj wyniki"
+msgstr "zapisuję wyniki"
#: src/grep.c:1209
#, c-format
@@ -77,7 +82,7 @@ msgstr "Plik binarny %s pasuje do wzorca\n"
#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(standardowe wejcie)"
+msgstr "(standardowe wejście)"
#: src/grep.c:1355
#, c-format
@@ -86,37 +91,37 @@ msgstr "uwaga: %s: %s\n"
#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr "nieskoczona ptla przegldania katalogw"
+msgstr "nieskończona pętla przeglądania katalogów"
#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Uycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
+msgstr "Składnia: %s [OPCJA]... WZORZEC [PLIK] ...\n"
#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Napisz `%s --help' eby dowiedzie si wicej.\n"
+msgstr "Napisz `%s --help' żeby dowiedzieć się więcej.\n"
#: src/grep.c:1412
#, c-format
msgid "Search for PATTERN in each FILE or standard input.\n"
-msgstr "Szukanie WZORCA w kadym PLIKU lub na standardowym wejciu\n"
+msgstr "Szukanie WZORCA w każdym PLIKU lub na standardowym wejściu\n"
#: src/grep.c:1415
#, c-format
msgid "PATTERN is an extended regular expression (ERE).\n"
-msgstr "WZORZEC jest rozszerzonym wyraeniem regularnym (ERE).\n"
+msgstr "WZORZEC jest rozszerzonym wyrażeniem regularnym (ERE).\n"
#: src/grep.c:1418
#, c-format
msgid "PATTERN is a set of newline-separated fixed strings.\n"
-msgstr "WZORZEC jest zbiorem acuchw znakw w kolejnych liniach.\n"
+msgstr "WZORZEC jest zbiorem łańcuchów znaków w kolejnych liniach.\n"
#: src/grep.c:1421
#, c-format
msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
-msgstr "WZORZEC domylnie jest podstawowym wyraeniem regularnym (BRE).\n"
+msgstr "WZORZEC domyślnie jest podstawowym wyrażeniem regularnym (BRE).\n"
#: src/grep.c:1424
#, c-format
@@ -125,9 +130,9 @@ msgid ""
"\n"
"Regexp selection and interpretation:\n"
msgstr ""
-"Przykad: %s -i 'hello world' menu.h main.c\n"
+"Przykład: %s -i 'hello world' menu.h main.c\n"
"\n"
-"Wybr i interpretacja wyrae regularnych:\n"
+"Wybór i interpretacja wyrażeń regularnych:\n"
#: src/grep.c:1429
#, c-format
@@ -140,7 +145,7 @@ msgstr ""
" -E, --extended-regexp WZORZEC jest rozszerzonym wyr. regularnym (ERE)\n"
" -F, --fixed-strings WZORZEC napisy oddzielone przez zn. nowej linii\n"
" -G, --basic-regexp WZORZEC jest podstawowym wyr. regularnym (BRE)\n"
-" -P, --perl-regexp WZORZEC jest wyraeniem regularnym perla\n"
+" -P, --perl-regexp WZORZEC jest wyrażeniem regularnym perla\n"
#: src/grep.c:1436
#, c-format
@@ -152,12 +157,12 @@ 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=WZORZEC uycie WZORCA jako wyraenia regularnego\n"
-" -f, --file=PLIK uycie wzorcw z PLIKU\n"
-" -i, --ignore-case zignorowanie ronic midzy maymi i wlk. lit.\n"
-" -w, --word-regexp dopasowanie WZORCA tylko do penych sw\n"
-" -x, --line-regexp dopasowanie WZORCA tylko do caych linii\n"
-" -z, --null-data linie s zakoczone bajtem 0, nie znakiem\n"
+" -e, --regexp=WZORZEC użycie WZORCA jako wyrażenia regularnego\n"
+" -f, --file=PLIK użycie wzorców z PLIKU\n"
+" -i, --ignore-case zignorowanie rożnic między małymi i wlk. lit.\n"
+" -w, --word-regexp dopasowanie WZORCA tylko do pełnych słów\n"
+" -x, --line-regexp dopasowanie WZORCA tylko do całych linii\n"
+" -z, --null-data linie są zakończone bajtem 0, nie znakiem\n"
" nowej linii\n"
#: src/grep.c:1443
@@ -172,12 +177,12 @@ msgid ""
" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
-"Rne:\n"
-" -s, --no-messages bez komunikatw o bdach\n"
-" -v, --revert-match wybierz linie nie pasujce\n"
-" -V, --version wypisz informacj o wersji i zakocz\n"
-" --help wywietl t informacj i zakocz\n"
-" --mmap jeeli moliwe mapuj pliki w pamici\n"
+"Różne:\n"
+" -s, --no-messages bez komunikatów o błędach\n"
+" -v, --revert-match wybierz linie nie pasujące\n"
+" -V, --version wypisz informację o wersji i zakończ\n"
+" --help wyświetl tę informację i zakończ\n"
+" --mmap jeżeli możliwe mapuj pliki w pamięci\n"
#: src/grep.c:1451
#, c-format
@@ -213,35 +218,35 @@ msgid ""
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
-"Sterowanie danymi wyjciowymi:\n"
+"Sterowanie danymi wyjściowymi:\n"
" -m, --max-count=ILE zatrzymanie po ILU dopasowaniach\n"
-" -b, --byte-offset wypisanie pozycji bajtw w wyniku\n"
-" -n, --line-number wypisanie numerw linii w wyniku\n"
-" --line-buffered oprnienie bufora 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"
+" -b, --byte-offset wypisanie pozycji bajtów w wyniku\n"
+" -n, --line-number wypisanie numerów linii w wyniku\n"
+" --line-buffered opróżnienie bufora po każdej linii\n"
+" -H, --with-filename wypisanie nazwy pliku dla każdej linii\n"
+" -h, --no-filename bez nazwy pliku w liniach wyjściowych\n"
+" --label=ETYKIETA w wyniku ETYKIETA zastępuje nazwe pliku\n"
+" -o, --only-matching pokazanie tylko kawałka, który pasuje do WZORCA\n"
+" -q, --quiet, --silent wyłączenie wypisywanie wyniku\n"
+" --binary-files=TYP założenie, ż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=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"
-" -T, --initial-tab wyrwnanie linii\n"
-" -Z, --null wypisanie bajtu 0 po kadej nazwie PLIKU\n"
+" -a, --text równoważne --binary-files=text\n"
+" -I równoważne --binary-files=without-match\n"
+" -d, --directories=DZIAŁANIE jak się obchodzić z katalogami,\n"
+" DZIAŁANIE to `read' (czytanie), `recurse'\n"
+" (przeglądanie rekurencujne) albo 'skip'\n"
+" (pominięcie).\n"
+" -D, --devices=DZIAŁANIE jak odwoływać się do urządzeń, FIFO i gniazd,\n"
+" DZIAŁANIE to 'read' (czytaj) albo 'skip' (pomiń)\n"
+" -R, -r, --recursive równoważne --directories=recurse .\n"
+" --include=WZORZEC przeszukiwane będą pliki pasujące do WZORCA\n"
+" --exclude=WZORZEC pliki pasujące do WZORCA będą pominięte\n"
+" --exclude-from=PLIK pominięcie plików pasujących do WZORCÓW w PLIKU\n"
+" -L, --files-without-match wypisanie tylko nazw PLIKÓW bez trafień\n"
+" -l, --files-with-matches wypisanie tylko nazw PLIKÓW z trafieniami\n"
+" -c, --count wypisanie tylko ilości pasujących linii w PLIKACH\n"
+" -T, --initial-tab wyrównanie linii\n"
+" -Z, --null wypisanie bajtu 0 po każdej nazwie PLIKU\n"
#: src/grep.c:1481
#, c-format
@@ -266,22 +271,22 @@ msgstr ""
" -C, --context=ILE wypisanie ILU linii kontekstu\n"
" -ILE to samo co --context=ILE\n"
" --color[=KIEDY],\n"
-" --colour[=KIEDY] oznaczanie pasujcych znakw,\n"
+" --colour[=KIEDY] oznaczanie pasujących znaków,\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, --binary bez usuwania znaków nowej linii na końcu\n"
+" -u, --unix-byte-offsets podawanie pozycji tak jakby nie było CRów (MSDOS)\n"
"\n"
#: src/grep.c:1495
#, c-format
msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
-msgstr "Wywoanie jako `egrep' jest przestarzae, uywa `grep -E'.\n"
+msgstr "Wywołanie jako `egrep' jest przestarzałe, używał `grep -E'.\n"
#: src/grep.c:1498
#, c-format
msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
-msgstr "Wywoanie jako `fgrep' jest przestarzae, uywa `grep -F'.\n"
+msgstr "Wywołanie jako `fgrep' jest przestarzałe, używał `grep -F'.\n"
#: src/grep.c:1501
#, c-format
@@ -290,7 +295,7 @@ msgid ""
"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
msgstr ""
"`egrep' oznacza `grep -E'. `fgrep' oznacza `grep -F'.\n"
-"Uywanie nazw `egrep' i `fgrep' jest przestarzae.\n"
+"Używanie nazw `egrep' i `fgrep' jest przestarzałe.\n"
#: src/grep.c:1505
#, c-format
@@ -299,9 +304,9 @@ msgid ""
"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
"if any error occurs and -q was not given, the exit status is 2.\n"
msgstr ""
-"Bez podanie PLIKU albo gdy PLIK to -, czytane jest standardowe wejcie.\n"
-"Jeeli podano mniej ni dwa PLIKI, zakada -h. Zakoczenie z kodem 0\n"
-"jeeli WZORZEC pasuje, z 1, jeeli nie, z 2, jeeli s problemy.\n"
+"Bez podanie PLIKU albo gdy PLIK to -, czytane jest standardowe wejście.\n"
+"Jeżeli podano mniej niż dwa PLIKI, zakłada -h. Zakończenie z kodem 0\n"
+"jeżeli WZORZEC pasuje, z 1, jeżeli nie, z 2, jeżeli są problemy.\n"
#: src/grep.c:1509
#, c-format
@@ -310,7 +315,7 @@ msgid ""
"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Raporty o bdach naley wysya do %s .\n"
+"Raporty o błędach należy wysyłać do %s .\n"
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
@@ -319,77 +324,79 @@ msgstr ""
# opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-# La opcin -X es a la que corresponde esta lnea.
+# La opción -X es a la que corresponde esta línea.
#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "podane sprzeczne wzorce"
-#: src/grep.c:1715
+#: src/grep.c:1716
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
-msgstr "W GREP_COLORS=\"%s\", wasno \"%s\" musi mie warto (\"=...\"); pominita."
+msgstr "W GREP_COLORS=\"%s\", własność \"%s\" musi mieć wartość (\"=...\"); pominięta."
-#: src/grep.c:1719
+#: src/grep.c:1720
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
-msgstr "W GREP_COLORS=\"%s\", wasno \"%s\" jest binarna i nie moe mie podanej wartoci (\"=%s\"); pominita."
+msgstr "W GREP_COLORS=\"%s\", własność \"%s\" jest binarna i nie może mieć podanej wartości (\"=%s\"); pominięta."
-#: src/grep.c:1727
+#: src/grep.c:1729
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
-msgstr "W GREP_COLORS=\"%s\", wasno \"%s\" to %s."
+msgstr "W GREP_COLORS=\"%s\", własność \"%s\" to %s."
-#: src/grep.c:1750
+#: src/grep.c:1752
#, c-format
msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
-msgstr "Zaprzestano przetwarzanie le sformatowanych GREP_COLORS=\"%s\" na znakach: \"%s\"."
+msgstr "Zaprzestano przetwarzanie źle sformatowanych GREP_COLORS=\"%s\" na znakach: \"%s\"."
-#: src/grep.c:1883
+#: src/grep.c:1885
msgid "unknown devices method"
-msgstr "nieznany sposb przegldania urzdze"
+msgstr "nieznany sposób przeglądania urządzeń"
-#: src/grep.c:1956
+#: src/grep.c:1959
msgid "unknown directories method"
-msgstr "nieznany sposb przegldania katalogw"
+msgstr "nieznany sposób przeglądania katalogów"
-#: src/grep.c:2023
+#: src/grep.c:2027
msgid "invalid max count"
-msgstr "bdna maksymalna liczba powtrze"
+msgstr "błędna maksymalna liczba powtórzeń"
-#: src/grep.c:2078
+#: src/grep.c:2082
msgid "unknown binary-files type"
msgstr "nieznany typ pliku binarnego"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-2002, 2004, 2005, 2007 Free Software Foundation, Inc.\n"
-
-#: src/grep.c:2184
+#: src/grep.c:2186
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s w kodzie rdowym.\n"
-"Nie podlega adnej gwarancji, nawet gwarancji przydatnoci do jakiegokolwiek\n"
-"zastosowania lub sprzeday.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencja GPLv3+: GNU GPL wersja 3 albo późniejsza <http://gnu.org/licenses/gpl.html>\n"
+"To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
+"Autorzy NIE DAJĄ GWARANCJI w granicach dozwolonych prawem.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
-msgstr "Program skompilowany bez opcji -P poprzez wczenie --disable-perl-regexp"
+msgstr "Program skompilowany bez opcji -P poprzez włączenie --disable-perl-regexp"
#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "Opcje -P i -z nie mog wystpowa razem"
+msgstr "Opcje -P i -z nie mogą występować razem"
#: src/search.c:634
msgid "The -P option only supports a single pattern"
-msgstr "Opcja -P moe by uyta tylko do pojedynczego wzorca"
+msgstr "Opcja -P może być użyta tylko do pojedynczego wzorca"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
-msgstr "Nieznany bd systemowy"
+msgstr "Nieznany błąd systemowy"
+
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "błąd zapisu"
#: lib/getopt.c:675
#, c-format
@@ -399,12 +406,12 @@ msgstr "%s: opcja `%s' jest niejednoznaczna\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcja `--%s' nie moe mie argumentu\n"
+msgstr "%s: opcja `--%s' nie może mieć argumentu\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcja `%c%s' nie moe mie argumentu\n"
+msgstr "%s: opcja `%c%s' nie może mieć argumentu\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
@@ -433,7 +440,7 @@ msgstr "%s: nielegalna opcja -- %c\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: bdna opcja -- %c\n"
+msgstr "%s: błędna opcja -- %c\n"
#. 1003.2 specifies the format of this message.
#: lib/getopt.c:815 lib/getopt.c:945
@@ -449,7 +456,7 @@ msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcja `-W %s' nie moe mie argumentu\n"
+msgstr "%s: opcja `-W %s' nie może mieć argumentu\n"
#. Get translations for open and closing quotation marks.
#.
@@ -472,3 +479,71 @@ msgstr "\""
#: lib/quotearg.c:260
msgid "'"
msgstr "\""
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Udane"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Nie pasuje"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Błędne wyrażenie regularne"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Błędny znak dla uporządkowania"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Błędna nazwa klasy znaków"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Końcowy ukośnik odwrotny"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Błędne odwołanie"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Nie pasujący [ albo [^"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Nie pasujący ( albo \\("
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Nie pasujący \\{"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Błędna zawartość \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Błędny koniec zakresu"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Błędne poprzedzające wyrażenie regularne"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Przedwczesny koniec wyrażenia regularnego"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Za duże wyrażenie regularne"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Nie pasujący ) albo \\)"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Brak poprzedniego wyrażenia regularnego"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d70b51e7..92b0c950 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,154 +1,179 @@
+# translation of grep-2.5.4-pre4.po to Brazilian Portuguese
+# This file is distributed under the same license as the grep package.
# grep: translation to Brazilian Portuguese (pt_BR)
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Alexandre Folle de Menezes <afmenez@terra.com.br>, 2002.
+# Copyright (C) 2002, 2007, 2008, 2009 Free Software Foundation, Inc.
# based on the previous translation to pt_BR (v2.4f) by
-# Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 1997.
# based on the translation to Spanish (es) by
-# Enrique Melero Gmez <melero@eurolands.com>, 1996.
-# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001, 2002.
#
+# Alexandre Folle de Menezes <afmenez@terra.com.br>, 2002.
+# Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 1997.
+# Enrique Melero G�mez <melero@eurolands.com>, 1996.
+# Santiago Vila Doncel <sanvila@unex.es>, 1997, 1998, 1999, 2000, 2001, 2002.
+# Rodolfo Ribeiro Gomes <rodolforg@gmail.com>, 2007, 2008, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-01-22 14:39+0100\n"
-"PO-Revision-Date: 2002-07-23 03:15-0300\n"
-"Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
+"Project-Id-Version: grep-2.5.4-pre4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-23 19:26-0200\n"
+"Last-Translator: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>\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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
-msgstr "Memria esgotada"
+msgstr "Memória 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:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
-msgstr "[ desbalanceado"
+msgstr "[ sem correspondente"
-#: src/dfa.c:741
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
-msgstr "Escape \\ inacabado"
+msgstr "Escape \\ não terminado"
#. 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:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
-msgstr "contador de repetio no terminado"
+msgstr "contador de repetição não terminado"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
-msgstr "contador de repetio mal formulado"
+msgstr "contador de repetição mal formulado"
-#: src/dfa.c:1253
+#: src/dfa.c:1306
msgid "Unbalanced ("
-msgstr "( desbalanceado"
+msgstr "( sem correspondente"
-#: src/dfa.c:1378
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Nenhuma sintaxe especificada"
-#: src/dfa.c:1386
+#: src/dfa.c:1439
msgid "Unbalanced )"
-msgstr ") desbalanceado"
+msgstr ") sem correspondente"
-#: src/dfa.c:2956
-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
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
-msgstr "memria esgotada"
+msgstr "memória esgotada"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
-msgstr "argumento comprimento do contexto invlido"
+msgstr "argumento inválido para comprimento do contexto"
-#: src/grep.c:475
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "entrada longa de mais para contar"
+msgstr "entrada longa demais para contar"
-#: src/grep.c:597
+#: src/grep.c:927
msgid "writing output"
-msgstr "escrevendo sada"
+msgstr "escrevendo na saída"
-#: src/grep.c:870
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Arquivo binrio %s casa com o padro\n"
+msgstr "Arquivo binário %s coincide com o padrão\n"
-#: src/grep.c:884
+#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(entrada padro)"
+msgstr "(entrada padrão)"
-#: src/grep.c:989
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "aviso: %s: %s\n"
-#: src/grep.c:990
+#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr "loop de diretrio recursivo"
+msgstr "recursão cíclica de diretório"
-#: src/grep.c:1038
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Uso: %s [OPO]... PADRO [ARQUIVO]...\n"
+msgstr "Uso: %s [OPÇÃO]... PADRÃO [ARQUIVO]...\n"
-#: src/grep.c:1040
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Tente `%s --help' para mais informaes.\n"
+msgstr "Experimente \"%s --help\" para mais informações.\n"
+
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Busca por PADRÃO em cada ARQUIVO ou entrada padrão.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "PADRÃO é uma expressão regular estendida (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "PADRÃO é um conjunto de textos fixos separados por caractere de nova linha.\n"
-#: src/grep.c:1045
+#: src/grep.c:1421
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Uso: %s [OPO]... PADRO [ARQUIVO]...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "PADRÃO é, por padrão, uma expressão regular básica (BRE).\n"
-#: src/grep.c:1046
+#: src/grep.c:1424
#, 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 ""
-"Procura por PADRO em cada ARQUIVO ou entrada padro.\n"
-"Exemplo: %s -i 'hello world' menu.h main.c\n"
+"Exemplo: %s -i \"olá, mundo\" menu.h main.c\n"
"\n"
-"Seleo e interpretao de expresso regular:\n"
+"Seleção e interpretação de expressão regular:\n"
-#: src/grep.c:1051
+#: src/grep.c:1429
+#, c-format
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"
+" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression (BRE)\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 so strings separadas por nova linha\n"
-" -G, --basic-regexp PADRO um expresso regular bsica\n"
-" -P, --perl-regexp PADRO uma expresso regular Perl\n"
+" -E, --extended-regexp PADRÃO é uma expressão regular estendida\n"
+" -F, --fixed-strings PADRÃO são textos separados por nova linha\n"
+" -G, --basic-regexp PADRÃO é uma expressão regular básica\n"
+" -P, --perl-regexp PADRÃO é uma expressão regular de sintaxe Perl\n"
-#: src/grep.c:1056
+#: src/grep.c:1436
+#, c-format
msgid ""
-" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -e, --regexp=PATTERN use PATTERN for matching\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=PADRO usar PADRO como uma expresso regular\n"
-" -f, --file=ARQUIVO obter PADRO do ARQUIVO\n"
-" -i, --ignore-case ignora maisculas/minsculas\n"
-" -w, --word-regexp fora PADRO a casar apenas palavras inteiras\n"
-" -x, --line-regexp fora PADRO a casar apenas linhas inteiras\n"
-" -z, --null-data uma linha de dados acaba com byte 0, no nova linha\n"
-
-#: src/grep.c:1063
+" -e, --regexp=PADRÃO usa PADRÃO como uma expressão regular\n"
+" -f, --file=ARQUIVO obtém PADRÃO do ARQUIVO\n"
+" -i, --ignore-case ignora diferenças entre maiúsculas/minúsculas\n"
+" -w, --word-regexp força PADRÃO a coincidir só com palavras inteiras\n"
+" -x, --line-regexp força PADRÃO a coincidir só com linhas inteiras\n"
+" -z, --null-data uma linha de dados termina com byte 0, e não com\n"
+" caractere de nova linha\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -159,14 +184,15 @@ msgid ""
" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
-"Miscelnea:\n"
+"Miscelânea:\n"
" -s, --no-messages suprime mensagens de erro\n"
-" -v, --revert-match seleciona somente linhas no casadas\n"
-" -V, --version mostra informaes sobre verso e sai\n"
+" -v, --invert-match seleciona somente linhas não coincidentes\n"
+" -V, --version mostra informações sobre versão e sai\n"
" --help exibe esta ajuda e sai\n"
-" --mmap usa entrada mapeada em memria se possvel\n"
+" --mmap usa entrada mapeada em memória se possível\n"
-#: src/grep.c:1071
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -179,55 +205,64 @@ msgid ""
" --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"
+" --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"
+" -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"
+" --include=FILE_PATTERN search only files that match FILE_PATTERN\n"
+" --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n"
+" --exclude-from=FILE skip files matching any file pattern from FILE\n"
+" --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n"
+" -L, --files-without-match print only names of FILEs containing no match\n"
+" -l, --files-with-matches print only names of FILEs containing matches\n"
+" -c, --count print only a count of matching lines per FILE\n"
+" -T, --initial-tab make tabs line up (if needed)\n"
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
-"Controle de sada:\n"
-" -m, --max-count=NM parar depois de NUM linhas casadas\n"
-" -b, --byte-offset exibe o deslocamento em bytes junto com a sada\n"
-" -n, --line-number exibe o nmero da linha junto com a sada\n"
-" --line-buffered esvazia o buffer de saida em cada linha\n"
-" -H, --with-filename exibe o nome do arquivo para cada padro encontrado\n"
-" -h, --no-filename inibe o nome de arquivo na sada\n"
-" --label=ETIQUETA mostra ETIQUETA como o nome da entrada padro\n"
-" -o, --only-matching mostra apenas da linha que casa com PADRO\n"
-" -q, --quiet, --silent inibe todas as sadas normais\n"
-" --binary-files=TIPO assume que arquivos binrios so TIPO\n"
-" TIPO 'binary'. 'text', ou 'without-match'.\n"
+"Controle de saída:\n"
+" -m, --max-count=NÚM interrompe depois de NÚM coincidências\n"
+" -b, --byte-offset exibe a posição em bytes junto com a saída\n"
+" -n, --line-number exibe o número da linha junto com a saída\n"
+" --line-buffered libera a saída a cada linha\n"
+" -H, --with-filename exibe o nome do arquivo para cada padrão encontrado\n"
+" -h, --no-filename inibe o nome de arquivo na saída\n"
+" --label=RÓTULO mostra RÓTULO como o nome da entrada padrão\n"
+" -o, --only-matching mostra apenas a parte da linha que coincide com\n"
+" o PADRÃO\n"
+" -q, --quiet, --silent inibe todas as mensagens de saída normais\n"
+" --binary-files=TIPO assume que arquivos binários são TIPO\n"
+" TIPO pode ser \"binary\" (binário), \"text\" (texto),\n"
+" ou \"without-match\" (nunca coincide).\n"
" -a, --text equivalente a --binary-files=text\n"
" -I equivalente a --binary-files=without-match\n"
-" -d, --directories=AO como tratar diretrios\n"
-" AO pode ser: 'read' (ler), 'recurse' (recursivo),\n"
-" ou 'skip' (no considerar).\n"
+" -d, --directories=AÇÃO como tratar diretórios;\n"
+" AÇÃO pode ser \"read\" (ler), \"recurse\" (recursivo),\n"
+" ou \"skip\" (ignorar).\n"
+" -D, --devices=AÇÃO como tratar dispositivos, FIFOs e soquetes;\n"
+" AÇÃO pode ser \"read\" (ler) ou \"skip\" (ignorar)\n"
" -R, -r, --recursive equivalente a --directories=recurse.\n"
-" --include=PATTERN arquivos que casam com PADRO sero examinados\n"
-" --exclude=PATTERN arquivos que casam com PADRO sero ignorados.\n"
-" --exclude-from=FILE arquivos que casam com PADRO no ARQUIVO\n"
-" sero ignorados.\n"
-" -L, --files-without-match exibe os nomes somente dos arquivos no casam\n"
-" com o padro\n"
+" --include=PADRÃO_ARQ busca apenas em arquivos que casam com PADRÃO_ARQ\n"
+" --exclude=PADRÃO_ARQ ignora arquivos que casam com PADRÃO_ARQ\n"
+" --exclude-from=ARQUI ignora arquivos que casam com algum padrão escrito\n"
+" em ARQUIvo\n"
+" --exclude-dir=PADRÃO diretórios que casam com PADRÃO serão ignorados\n"
+" -L, --files-without-match exibe os nomes somente dos arquivos não casam\n"
+" com o PADRÃO\n"
" -l, --files-with-matches exibe os nomes somente dos arquivos casam com\n"
-" o padro\n"
-" -c, --count exibe a contagem de linhas que casam com o padro\n"
-" por ARQUIVO\n"
-" -Z, --null mostra byte 0 depois do nome do ARQUIVO\n"
+" o padrão\n"
+" -c, --count exibe a contagem de linhas por aquivo que casam\n"
+" com o padrão\n"
+" -T, --initial-tab alinha por tabulação (se necessário)\n"
+" -Z, --null emite byte 0 depois do nome do ARQUIVO\n"
-#: src/grep.c:1099
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -236,150 +271,197 @@ msgid ""
" -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"
+" --colour[=WHEN] use markers to highlight the matching strings;\n"
+" WHEN is `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"
"Controle de contexto:\n"
-" -B, --before-context=NUM mostra NUM linhas de contexto anterior\n"
-" -A, --after-context=NUM mostra NUM linhas de contexto posterior\n"
-" -C, --context=[NUM] mostra NUM linhas de contexto de sada\n"
-" -NUM o mesmo que --context=NUM\n"
+" -B, --before-context=NÚM mostra NÚM linhas de contexto anteriores\n"
+" -A, --after-context=NÚM mostra NÚM linhas de contexto posteriores\n"
+" -C, --context=[NÚM] mostra NÚM linhas de contexto de saída\n"
+" -NÚM o mesmo que --context=NÚM\n"
" --color[=QUANDO],\n"
-" --colour[=QUANDO] usa marcadores para distinguir a string casada\n"
-" QUANDO pode ser `always' (sempre), `never' (nunca)\n"
-" ou `auto' (automtico).\n"
-" -U, --binary no elimina caracteres CR em final de linha (MSDOS)\n"
-" -u, --unix-byte-offsets reporta deslocamentos como se no existissem CRs (MSDOS)\n"
+" --colour[=QUANDO] usa marcadores para destacar o texto coincidente;\n"
+" QUANDO pode ser \"always\" (sempre), \"never\"\n"
+" (nunca) ou \"auto\" (automático).\n"
+" -U, --binary não elimina caracteres CR no fim de linha (MSDOS)\n"
+" -u, --unix-byte-offsets relata posições como se não existissem CRs (MSDOS)\n"
"\n"
-"`egrep' significa `grep -E', `fgrep' significa `grep -F'.\n"
-"Se no informado o ARQUIVO, ou se ARQUIVO -, l da entrada padro. Se menos\n"
-"que dois ARQUIVOs forem especificados, assume -h. Retorna 0 se encontra o\n"
-"padro, 1 se no encontra, e 2 se houver erros.\n"
-#: src/grep.c:1116
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Invocar como \"egrep\" está obsoleto; use \"grep -E\".\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "Invocar como \"fgrep\" está obsoleto; use \"grep -F\".\n"
+
+#: src/grep.c:1501
+#, c-format
+msgid ""
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
+msgstr ""
+"\"egrep\" significa \"grep -E\". \"fgrep\" significa \"grep -F\".\n"
+"Invocação direta tanto por \"egrep\" como por \"fgrep\" está obsoleta.\n"
+
+#: src/grep.c:1505
+#, c-format
+msgid ""
+"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
+"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Se não informado o ARQUIVO, ou se ARQUIVO é -, lê da entrada padrão. Se menos\n"
+"que dois ARQUIVOs forem especificados, assume -h. O estado de saída é 0 se o\n"
+"PADRÃO for encontrado, 1 caso contrário; se ocorrer algum erro ou -q não foi\n"
+"especificado, o estado de saída é 2.\n"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Informe problemas para <bug-gnu-utils@gnu.org>.\n"
+"Relate problemas para <%s>.\n"
-#: src/grep.c:1126
+#: src/grep.c:1522
msgid "conflicting matchers specified"
-msgstr "especificados padres de procura conflitantes"
+msgstr "especificou-se padrões de busca conflitantes"
+
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "Em GREP_COLORS=\"%s\", o recurso \"%s\" precisa de um valor (\"=...\"); ignorado."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "Em GREP_COLORS=\"%s\", o recurso \"%s\" é booleano e não pode assumir um valor (\"=%s\"); ignorado."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "Em GREP_COLORS=\"%s\", o recurso \"%s\" %s."
+
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Interrompido o processamento da variável mal formatada GREP_COLORS\"%s\" no trecho restante \"%s\"."
-#: src/grep.c:1363
+#: src/grep.c:1883
msgid "unknown devices method"
-msgstr "mtodo desconhecido de dispositivos"
+msgstr "método desconhecido de dispositivos"
-#: src/grep.c:1430
+#: src/grep.c:1957
msgid "unknown directories method"
-msgstr "mtodo desconhecido de diretrios"
+msgstr "método desconhecido de diretórios"
-#: src/grep.c:1497
+#: src/grep.c:2025
msgid "invalid max count"
-msgstr "valor mximo invlido"
+msgstr "valor máximo inválido"
-#: src/grep.c:1551
+#: src/grep.c:2080
msgid "unknown binary-files type"
-msgstr "tipo de arquivo binrio desconhecido"
+msgstr "tipo de arquivo binário desconhecido"
-#: src/grep.c:1646
+#: src/grep.c:2184
#, 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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Este um software livre; veja o cdigo fonte para condies de copyright. No\n"
-"existe NENHUMA garantia; nem mesmo a garantia implcita de COMERCIABILIDADE ou\n"
-"ADEQUAO QUALQUER FINALIDADE PARTICULAR.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "A opo -P no suportada"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licença GPLv3+: GNU GPL versão 3 ou superior <http://gnu.org/licenses/gpl.html>\n"
+"Este é um software livre: você é livre para alterá-lo e redistribuí-lo.\n"
+"NÃO HÁ GARANTIAS, na máxima extensão permitida por lei.\n"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Suporte à opção -P não foi compilada neste binário --disable-perl-regexp"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "As opes -P e -z no podem ser combinadas"
+msgstr "As opções -P e -z não podem ser combinadas"
+
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Só há suporte a apenas um único padrão com a opção -P"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
-msgstr "Erro de sistema desconhecido"
+msgstr "Erro desconhecido de sistema"
+
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "erro de escrita"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opo `%s' ambgua\n"
+msgstr "%s: opção \"%s\" é ambígua\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"
+msgstr "%s: opção \"--%s\" não aceita argumentos\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"
+msgstr "%s: opção \"%c%s\" não aceita argumentos\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"
+msgstr "%s: opção \"%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"
+msgstr "%s: opção \"--%s\" desconhecida\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"
+msgstr "%s: opção \"%c%s\" desconhecida\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"
+msgstr "%s: opção ilegal -- %c\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: opo invlida -- %c\n"
+msgstr "%s: opção inválida -- %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 requer um argumento -- %c\n"
+msgstr "%s: opção exige 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"
+msgstr "%s: opção \"-W %s\" é ambígua\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"
+msgstr "%s: opção \"-W %s\" não aceita argumentos\n"
#. Get translations for open and closing quotation marks.
#.
@@ -397,8 +479,76 @@ msgstr "%s: opo `-W %s' no aceita um argumento\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr "`"
+msgstr "\""
#: lib/quotearg.c:260
msgid "'"
-msgstr "'"
+msgstr "\""
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Sucesso"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Nenhuma ocorrência do padrão"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Expressão regular inválida"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Caractere inválido de colagem"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Nome inválido de categoria de caracteres"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Barra invertida excedente ao final"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Retro-referência inválida"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "[ ou [^ sem correspondente"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "( ou \\( sem correspondente"
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "\\{ sem correspondente"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Conteúdo inválido de \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Fim inválido de intervalo"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Expressão regular precedente é inválida"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Fim prematuro da expressão regular"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Expressão regular grande demais"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr ") ou \\) sem correspondente"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Nenhuma expressão regular anterior"
diff --git a/po/ru.po b/po/ru.po
index 3513ced7..d9ef680f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,155 +1,175 @@
-# grep.
-# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-# Denis Perchine <dyp@perchine.com>, 1998-2000.
+# translation of grep-2.5.4-pre4.ru.po to Russian
+# Локализация для grep.
+# Copyright (C) 1997, 1998, 1999, 2000, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
#
+# Denis Perchine <dyp@perchine.com>, 1998-2000.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
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 12:18GMT+06\n"
-"Last-Translator: Denis Perchine <dyp@perchine.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
+"Project-Id-Version: grep 2.5.4-pre4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-23 18:46+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <gnu@mx.ru>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
-msgstr " "
+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:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
-msgstr " ["
+msgstr "Несбалансированная ["
-#: src/dfa.c:741
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
-msgstr " \\ "
+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
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
-msgstr " "
+msgstr "незавершённое количество повторений"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
-msgstr " "
+msgstr "некорректно указано количество повторений"
-#: src/dfa.c:1253
+#: src/dfa.c:1306
msgid "Unbalanced ("
-msgstr " ("
+msgstr "Несбалансированная ("
-#: src/dfa.c:1378
+#: src/dfa.c:1431
msgid "No syntax specified"
-msgstr " "
+msgstr "Не указано синтаксиса"
-#: src/dfa.c:1386
+#: src/dfa.c:1439
msgid "Unbalanced )"
-msgstr " )"
+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
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
-msgstr " "
+msgstr "память исчерпана"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
-msgstr " "
+msgstr "неверный аргумент длины контекста"
-#: src/grep.c:475
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr " , "
+msgstr "входные данные слишком велики, чтобы сосчитать"
-#: src/grep.c:597
+#: src/grep.c:927
msgid "writing output"
-msgstr " "
+msgstr "запись выходных данных"
-#: src/grep.c:870
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr " %s \n"
+msgstr "Двоичный файл %s совпадает\n"
-#: src/grep.c:884
+#: src/grep.c:1223
msgid "(standard input)"
-msgstr "( )"
+msgstr "(стандартный ввод)"
-#: src/grep.c:989
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
-msgstr ": %s: %s\n"
+msgstr "предупреждение: %s: %s\n"
-#: src/grep.c:990
+#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr " "
+msgstr "каталоги зациклены"
-#: src/grep.c:1038
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr ": %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "Использование: %s [ПАРАМЕТР]... ШАБЛОН [ФАЙЛ]...\n"
-#: src/grep.c:1040
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr " `%s --help' .\n"
+msgstr "Попробуйте `%s --help' для получения более подробного описания.\n"
+
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Поиск ШАБЛОНА в каждом ФАЙЛЕ или в стандартном вводе.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "ШАБЛОН представляет собой расширенное регулярное выражение (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "ШАБЛОН представляет строки фиксированной длины, разделённые символом новой строки.\n"
-#: src/grep.c:1045
+#: src/grep.c:1421
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr ": %s [OPTION]... PATTERN [FILE] ...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "По умолчанию, ШАБЛОН представляет собой простое регулярное выражение (BRE).\n"
-#: src/grep.c:1046
+#: src/grep.c:1424
#, 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 ""
-" PATTERN FILE .\n"
-": %s -i 'hello world' menu.h main.c\n"
+"Пример: %s -i 'hello world' menu.h main.c\n"
"\n"
-" :\n"
+"Выбор типа регулярного выражения и его интерпретация:\n"
-#: src/grep.c:1051
+#: src/grep.c:1429
+#, c-format
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"
+" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
+" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
+" -G, --basic-regexp PATTERN is a basic regular expression (BRE)\n"
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
-" -E, --extended-regexp PATTERN - \n"
-" -F, --fixed-regexp PATTERN , \n"
-" \n"
-" -G, --basic-regexp PATTERN \n"
-" -P, --perl-regexp PATTERN Perl\n"
+" -E, --extended-regexp ШАБЛОН - расширенное регулярное выражение (ERE)\n"
+" -F, --fixed-regexp ШАБЛОН - строки фиксированной длины, разделённые\n"
+" символом новой строки\n"
+" -G, --basic-regexp ШАБЛОН - простое регулярное выражение (BRE)\n"
+" -P, --perl-regexp ШАБЛОН - регулярное выражения языка Perl\n"
-#: src/grep.c:1056
+#: src/grep.c:1436
+#, c-format
msgid ""
-" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
+" -e, --regexp=PATTERN use PATTERN for matching\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 ""
-" PATTERN FILE' .\n"
-"\n"
-" :\n"
-" -e, --regexp=PATTERN PATTERN \n"
-" -f, --file=FILE PATTERN FILE'\n"
-" -i, --ignore-case \n"
-" -w, --word-regexp PATTERN \n"
-" -x, --line-regexp PATTERN \n"
-" -z, --null-data 0, \n"
-" \n"
-
-#: src/grep.c:1063
+" -e, --regexp=ШАБЛОН использовать ШАБЛОН для поиска\n"
+" -f, --file=ФАЙЛ брать ШАБЛОН из ФАЙЛа\n"
+" -i, --ignore-case игнорировать различие регистра\n"
+" -w, --word-regexp ШАБЛОН должен подходить ко всем словам\n"
+" -x, --line-regexp ШАБЛОН должен подходить ко всей строке\n"
+" -z, --null-data строки разделяются байтом с нулевым значением, а не\n"
+" символом конца строки\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -160,14 +180,16 @@ msgid ""
" --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 mmap \n"
-
-#: src/grep.c:1071
+"Разное:\n"
+" -s, --no-messages подавлять сообщения об ошибках\n"
+" -v, --revert-match выбирать не подходящие строки\n"
+" -V, --version напечатать информацию о версии и выйти\n"
+" --help показать эту справку и выйти\n"
+" --mmap при возможности, использовать ввод,\n"
+" спроецированный в память\n"
+
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -180,53 +202,64 @@ msgid ""
" --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"
+" --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"
+" -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"
+" --include=FILE_PATTERN search only files that match FILE_PATTERN\n"
+" --exclude=FILE_PATTERN skip files and directories matching FILE_PATTERN\n"
+" --exclude-from=FILE skip files matching any file pattern from FILE\n"
+" --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n"
+" -L, --files-without-match print only names of FILEs containing no match\n"
+" -l, --files-with-matches print only names of FILEs containing matches\n"
+" -c, --count print only a count of matching lines per FILE\n"
+" -T, --initial-tab make tabs line up (if needed)\n"
" -Z, --null print 0 byte after FILE name\n"
msgstr ""
"\n"
-" :\n"
-" -m, --max-count=NUM NUM \n"
-" -b, --byte-offset \n"
-" \n"
-" -n, --line-number \n"
-" --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"
-" -a, --text \n"
-" -I , --binary-files=without-match\n"
-" -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"
-" --exclude-from=FILE , PATTERN FILE.\n"
-" -L, --files-without-match \n"
-" -l, --files-with-matches \n"
-" -c, --count \n"
-" -Z, --null 0 \n"
-
-#: src/grep.c:1099
+"Управление выводом:\n"
+" -m, --max-count=ЧИСЛО остановиться после указанного ЧИСЛА совпадений\n"
+" -b, --byte-offset печатать вместе с выходными строками смещение в\n"
+" байтах\n"
+" -n, --line-number печатать номер строки вместе с выходными строками\n"
+" --line-buffered сбрасывать буфер после каждой строки\n"
+" -H, --with-filename печатать имя файла для каждого совпадения\n"
+" -h, --no-filename не начинать вывод с имени файла\n"
+" --label=МЕТКА выводить МЕТКУ в качестве имени файла для\n"
+" стандартного ввода\n"
+" -o, --only-matching показывать только часть строки, совпадающей с ШАБЛОНОМ\n"
+" -q, --quiet, --silent подавить весь обычный вывод\n"
+" --binary-files=ТИП считать, что двоичный файл ТИПА:\n"
+" binary, text или without-match.\n"
+" -a, --text то же что и --binary-files=text\n"
+" -I то же, что и --binary-files=without-match\n"
+" -d, --directories=ДЕЙСТВ как обрабатывать каталоги\n"
+" ДЕЙСТВИЕ может быть read (читать),\n"
+" recurse (рекурсивно), или skip (пропускать).\n"
+" -D, --devices=ДЕЙСТВ как обрабатывать устройства, FIFO и сокеты\n"
+" ДЕЙСТВИЕ может быть 'read' или 'skip'\n"
+" -R, -r, --recursive то же, что и --directories=recurse\n"
+" --include=Ф_ШАБЛОН обработать только файлы, подпадающие под Ф_ШАБЛОН\n"
+" --exclude=Ф_ШАБЛОН пропустить файлы и каталоги,\n"
+" подпадающие под Ф_ШАБЛОН\n"
+" --exclude-from=ФАЙЛ пропустить файлы, подпадающие под шаблон\n"
+" файлов из ФАЙЛА\n"
+" --exclude-dir=ШАБЛОН каталоги, подпадающие под ШАБЛОН,\n"
+" будут пропущены\n"
+" -L, --files-without-match печатать только имена ФАЙЛОВ без совпадений\n"
+" -l, --files-with-matches печатать только имена ФАЙЛОВ с совпадениями\n"
+" -c, --count печатать только количество совпадающих\n"
+" строк на ФАЙЛ\n"
+" -T, --initial-tab выравнивать табуляцией (если нужно)\n"
+" -Z, --null печатать байт 0 после имени ФАЙЛА\n"
+
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -235,151 +268,197 @@ msgid ""
" -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"
+" --colour[=WHEN] use markers to highlight the matching strings;\n"
+" WHEN is `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=NUM NUM \n"
-" -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"
-" -u, --unix-byte-offsets , - CR- (MSDOS)\n"
+"Управление контекстом:\n"
+" -B, --before-context=ЧИС печатать ЧИСЛО строк предшествующего контекста\n"
+" -A, --after-context=ЧИС печатать ЧИСЛО строк последующего контекста\n"
+" -C, --context[=ЧИС] печатать ЧИСЛО строк контекста,\n"
+" --color[=КОГДА],\n"
+" --colour[=КОГДА] использовать маркеры для различия совпадающих\n"
+" строк; КОГДА может быть always (всегда),\n"
+" never (никогда), или auto (автоматически)\n"
+" --color, --colour использовать маркеры для различия совпадающих строк\n"
+" -U, --binary не удалять символы CR в конце строки (MSDOS)\n"
+" -u, --unix-byte-offsets выдавать смещение, как-будто нет CR-ов (MSDOS)\n"
"\n"
-" -[GEF], `egrep' -E, `fgrep' -F, -G.\n"
-" FILE', FILE -, . \n"
-", , -h. 0 ,\n"
-" 1, . 2, .\n"
-#: src/grep.c:1116
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Запуск под именем egrep устарел; вместо этого используйте grep -E.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "Запуск под именем fgrep устарел; вместо этого используйте grep -F.\n"
+
+#: src/grep.c:1501
+#, c-format
+msgid ""
+"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
+"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
+msgstr ""
+"Вместо egrep предполагается запуск grep -E. Вместо fgrep предполагается grep -F.\n"
+"Запуск под именами egrep или fgrep лучше не выполнять.\n"
+
+#: src/grep.c:1505
+#, c-format
+msgid ""
+"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
+"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Когда не задан ФАЙЛ, или когда ФАЙЛ это -, то читается стандартный ввод.\n"
+"Если указано меньше, чем два файла, то предполагает -h. При нахождении\n"
+"совпадений кодом завершения программы будет 0, и 1, если нет.При возникновении\n"
+"ошибок, или если не указан параметр -q, кодом завершения будет 2.\n"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-gnu-utils@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-" <bug-gnu-utils@gnu.org>.\n"
+"Об ошибках сообщайте <%s>.\n"
-#: src/grep.c:1126
+#: src/grep.c:1522
msgid "conflicting matchers specified"
-msgstr " "
+msgstr "заданы конфликтующие образцы"
-#: src/grep.c:1363
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "В GREP_COLORS=\"%s\" для свойства \"%s\" требуется указать значение (\"=...\"); пропускается."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "В GREP_COLORS=\"%s\" свойство \"%s\" является логическим и не требует значения (\"=%s\"); пропускается."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "В GREP_COLORS=\"%s\" значение \"%s\" присвоено свойству %s."
+
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Прекращение обработки неправильной GREP_COLORS=\"%s\", начиная с оставшейся подстроки \"%s\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
-msgstr " "
+msgstr "неизвестный метод для устройств"
-#: src/grep.c:1430
+#: src/grep.c:1957
msgid "unknown directories method"
-msgstr " "
+msgstr "неизвестный метод для каталогов"
-#: src/grep.c:1497
+#: src/grep.c:2025
msgid "invalid max count"
-msgstr " "
+msgstr "неверное максимальное количество совпадений"
-#: src/grep.c:1551
+#: src/grep.c:2080
msgid "unknown binary-files type"
-msgstr " "
+msgstr "неизвестный тип binary-files"
-#: src/grep.c:1646
+#: src/grep.c:2184
#, 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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-" ; \n"
-" . , \n"
-" .\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr " -P "
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>\n"
+"Это свободное ПО: вы можете продавать и распространять его.\n"
+"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Поддержка параметра -P не включена при компиляции данного исполняемого файла (--disable-perl-regexp)"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr " -P -z "
+msgstr "Параметры -P и -z не совместимы"
-#: lib/error.c:117
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Параметр -P поддерживает только одиночный шаблон"
+
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
-msgstr " "
+msgstr "Неизвестная системная ошибка"
+
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "ошибка записи"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: '%s' \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"
+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"
+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"
+msgstr "%s: для параметра `%s' требуется значение\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%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"
+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"
+msgstr "%s: недопустимый параметр -- %c\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: -- %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"
+msgstr "%s: параметру требуется значение -- %c\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' \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"
+msgstr "%s: у параметра `-W %s' не может быть значения\n"
#. Get translations for open and closing quotation marks.
#.
@@ -402,3 +481,71 @@ msgstr "\""
#: lib/quotearg.c:260
msgid "'"
msgstr "\""
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Выполнено успешно"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Нет совпадений"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Неправильное регулярное выражение"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Неправильный символ сравнения"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Неправильный символ имени класса"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Завершающий символ обратной косой черты"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Неправильная обратная ссылка"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Непарная [ или [^"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Непарная ( или \\("
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Непарная \\{"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Неправильное содержимое в \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Неправильный конец диапазона"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Неправильное предшествующее регулярное выражение"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Преждевременное завершение регулярного выражения"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Регулярное выражение слишком большое"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Непарная ) или \\)"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Нет предыдущего регулярного выражения"
diff --git a/po/sk.po b/po/sk.po
index 48af6c44..dbfbd693 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,32 +1,32 @@
# Translation of grep to Slovak
-#
# Copyright (C) 1997-99, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Ivan Masár <helix84@centrum.sk>, 2007.
+# This file is distributed under the same license as the grep package.
+# Ivan Masár <helix84@centrum.sk>, 2007, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep 2.5.4-pre4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-11-09 13:57+0100\n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-24 18:37+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
msgstr "Pamäť bola vyčerpaná"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "[ bez náprotivku"
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Nedokončená \\ escape sekvencia"
@@ -34,28 +34,30 @@ msgstr "Nedokončená \\ escape sekvencia"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "Nedokončený počet opakovaní"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "Zle formulovaný počet opakovaní"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "( bez náprotivku"
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Neuvedená syntax"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr ") bez náprotivku"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "pamäť bola vyčerpaná"
@@ -97,7 +99,7 @@ msgstr "Použitie: %s [VOĽBA]... VZORKA [SÚBOR]...\n"
#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Viac informácií pomocou „%s --help“.\n"
+msgstr "Viac informácií získate príkazom „%s --help“.\n"
#: src/grep.c:1412
#, c-format
@@ -235,7 +237,7 @@ msgstr ""
" -R, -r, --recursive ekvivalentné s --directories=recurse\n"
" --include=SÚBOR_VZORKA hľadať iba v súboroch zodpoved. SÚBOR_VZORKA\n"
" --exclude=SÚBOR_VZORKA preskočiť súbory a adresáre zodp. SÚBOR_VZORKA\n"
-" --exclude-from=SÚBOR preskočiť súbory zodp. akejkoľvek vzorke zo SÚBORU\n"
+" --exclude-from=SÚBOR preskočiť súbory zodp. akejkoľvek vzorke zo SÚBORU\n"
" --exclude-dir=VZORKA preskočiť adresáre zodpovedajúce VZORKE.\n"
" -L, --files-without-match vypísať iba názvy SÚBOROV, ktoré neobsahujú zhodu\n"
" -l, --files-with-matches vypísať iba názvy SÚBOROV, ktoré obsahujú zhodu\n"
@@ -261,7 +263,7 @@ msgid ""
msgstr ""
"\n"
"Riadenie kontextu:\n"
-" -B, --before-context=POČ vytlačiť POČ riadkov kontextu pred\n"
+" -B, --before-context=POČ vytlačiť POČ riadkov kontextu pred\n"
" -A, --after-context=POČ vytlačiť POČ riadkov kontextu za\n"
" -C, --context=POČ vytlačiť POČ riadkov kontextu výstupu\n"
" -POČ rovnaké ako --context=ČÍS\n"
@@ -324,7 +326,7 @@ msgstr "V GREP_COLORS=\"%s\", potrebuje \"%s\" hodnotu (\"=...\"); preskakujem."
#: src/grep.c:1719
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
-msgstr "V GREP_COLORS=\"%s\", je \"%s\" booleovského typu a nemôže nadobúdať hodnotu (\"=%s\"); preskakujem."
+msgstr "V GREP_COLORS=\"%s\", je \"%s\" booleovského typu a nemôže nadobúdať hodnotu (\"=%s\"); preskakuje sa."
#: src/grep.c:1727
#, c-format
@@ -340,32 +342,30 @@ msgstr "Prerušené spracovanie zle utvoreného GREP_COLORS=\"%s\" na zvyšnom p
msgid "unknown devices method"
msgstr "neznáme metódy zariadení"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "neznáme metódy adresárov"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "neplatný maximálny počet"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "neznámy typ binárneho súboru"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Tento program je slobodný softvér; podmienky šírenia si pozrite v zdrojových\n"
-"súboroch. Nie je poskytovaná ŽIADNA záruka; ani záruka PREDAJNOSTI či\n"
-"VHODNOSTI NA DANÝ ÚČEL.\n"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencia GPLv3+: GNU GPL verzie 3 alebo neskoršej <http://gnu.org/licenses/gpl.html>\n"
+"Toto je slobodný softvér: môžete ho slobodne meniť a šíriť.\n"
+"Nie je poskytovaná ŽIADNA ZÁRUKA do miery akú povoľuje aplikovateľné právo.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -379,10 +379,14 @@ msgstr "Voľby -P a -z nie je možné kombinovať"
msgid "The -P option only supports a single pattern"
msgstr "Voľba -P podporuje iba jedinú vzorku"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Neznáma systémová chyba"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "chyba zápisu"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -463,3 +467,82 @@ msgstr "„"
#: lib/quotearg.c:260
msgid "'"
msgstr "“"
+
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Úspešne vykonané"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Nič nezodpovedá"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Neplatný regulárny výraz"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Neplatný radiaci znak"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Neplatný názov triedy znakov"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Spätná lomka na konci"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Neplatný spätný odkaz"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "[ alebo [^ bez náprotivku."
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "( alebo \\( bez náprotivku."
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "\\{ bez náprotivku."
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Neplatný obsah \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Neplatný koniec rozsahu"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Neplatný predošlý regulárny výraz"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Neplatný koniec regulárneho výrazu"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Regulárny výraz je príliš veľký"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr ") alebo \\) bez náprotivku."
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Žiadny predošlý regulárny výraz"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions. There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Tento program je slobodný softvér; podmienky šírenia si pozrite v zdrojových\n"
+#~ "súboroch. Nie je poskytovaná ŽIADNA záruka; ani záruka PREDAJNOSTI či\n"
+#~ "VHODNOSTI NA DANÝ ÚČEL.\n"
diff --git a/po/sl.po b/po/sl.po
index 70acd5db..1911f00a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,15 +1,16 @@
# -*- mode: po; coding: utf-8; -*- Slovenian message catalogue for grep
-# Copyright (C) 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999, 2000, 2007.
+# Copyright (C) 1996, 1999, 2000, 2007, 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
+# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999, 2000, 2007, 2008.
#
-# $Id: sl.po,v 1.32 2007/11/03 04:02:56 taa Exp $
+# $Id: sl.po,v 1.33 2009/02/01 03:11:06 taa Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5.3\n"
+"Project-Id-Version: GNU grep 2.5.4-pre3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-10-16 14:16+0200\n"
+"POT-Creation-Date: 2008-02-09 23:49-0400\n"
+"PO-Revision-Date: 2008-04-25 11:37+0200\n"
"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -17,18 +18,18 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704
msgid "Memory exhausted"
msgstr "Pomnilnik porabljen"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Oklepaj [ brez zaklepaja"
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Nedokončano ubežno zaporedje \\"
@@ -36,28 +37,28 @@ msgstr "Nedokončano ubežno zaporedje \\"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "nedokončano število ponovitev"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "slabo določeno število ponovitev"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Uklepaj ( brez zaklepaja"
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Skladnja ni podana"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Zaklepaj ) brez uklepaja"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#: lib/obstack.c:471 src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185
+#: src/kwset.c:408 src/search.c:68 src/search.c:225
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
@@ -102,22 +103,18 @@ msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help` za dodatna pojasnila.\n"
#: src/grep.c:1412
-#, c-format
msgid "Search for PATTERN in each FILE or standard input.\n"
msgstr "V DATOTEKI ali na standardnem vhodu iščemo VZOREC.\n"
#: src/grep.c:1415
-#, c-format
msgid "PATTERN is an extended regular expression (ERE).\n"
msgstr "VZOREC je razširjeni regularni izraz (RRI).\n"
#: src/grep.c:1418
-#, c-format
msgid "PATTERN is a set of newline-separated fixed strings.\n"
msgstr "VZOREC je množica nespremenljivih nizov, po eden v vrstici.\n"
#: src/grep.c:1421
-#, c-format
msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
msgstr "VZOREC je privzeto osnovni regularni izraz (ORI).\n"
@@ -133,7 +130,6 @@ msgstr ""
"Izbira in tolmačenje regularnih izrazov:\n"
#: src/grep.c:1429
-#, c-format
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression (ERE)\n"
" -F, --fixed-strings PATTERN is a set of newline-separated fixed strings\n"
@@ -146,7 +142,6 @@ msgstr ""
" -P, --perl-regexp VZOREC je regularni izraz z razširitvami perla\n"
#: src/grep.c:1436
-#, c-format
msgid ""
" -e, --regexp=PATTERN use PATTERN for matching\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -164,7 +159,6 @@ msgstr ""
" znakom za skok v novo vrstico\n"
#: src/grep.c:1443
-#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -183,7 +177,6 @@ msgstr ""
" --mmap če je možno, uporabi pomnilniško preslikan vhod\n"
#: src/grep.c:1451
-#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -247,7 +240,6 @@ msgstr ""
" -Z, --null izpiši znak NUL za imenom DATOTEKE\n"
#: src/grep.c:1481
-#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -276,17 +268,14 @@ msgstr ""
"\n"
#: src/grep.c:1495
-#, c-format
msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
msgstr "Raba ukaza »egrep« je odsvetovana; namesto njega uporabite »grep -E«.\n"
#: src/grep.c:1498
-#, c-format
msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
msgstr "Raba ukaza »fgrep« je odsvetovana; namesto njega uporabite »grep -F«.\n"
#: src/grep.c:1501
-#, c-format
msgid ""
"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
"Direct invocation as either `egrep' or `fgrep' is deprecated.\n"
@@ -295,7 +284,6 @@ msgstr ""
"Neposredna raba ukazov »egrep« ali »fgrep« je odsvetovana.\n"
#: src/grep.c:1505
-#, c-format
msgid ""
"With no FILE, or when FILE is -, read standard input. If less than two FILEs\n"
"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
@@ -348,32 +336,31 @@ msgstr "Prekinjena obdelava slabo formuliranega določila GREP_COLORS=\"%s\" pri
msgid "unknown devices method"
msgstr "neznana metoda datotek naprav"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "neznana metoda imenikov"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "neveljavno največje število"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "neznan tip binarne datoteke"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
-#, c-format
+msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+msgstr "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+
+#: src/grep.c:2186
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"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"To je prost program; pogoji, pod katerimi ga lahko uporabljate, razmnožujete\n"
-"in razširjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
-"niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n"
+"GPLv3+: GNU GPL, 3. izdaja ali poznejša <http://www.gnu.org/licenses/gpl.html>\n"
+"To je prosto programje; lahko ga redistribuirate in/ali spreminjate.\n"
+"Za izdelek ni NOBENEGA JAMSTVA, do z zakonom dovoljene meje.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -472,6 +459,14 @@ msgstr ","
msgid "'"
msgstr "`"
+#~ 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, razmnožujete\n"
+#~ "in razširjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
+#~ "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n"
+
#~ msgid "out of memory"
#~ msgstr "zmanjkalo pomnilnika"
diff --git a/po/sv.po b/po/sv.po
index 2b1c487e..259c6797 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,33 +1,34 @@
-# Swedish messages for GNU Grep version 2.5.3
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Swedish messages for GNU Grep version 2.5.4
+# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
# Thomas Olsson <cid95tho@student1.lu.se>, 1996.
# Daniel Resare <daniel@resare.com>, 1998, 1999, 2000, 2001
-# Daniel Nylander <po@danielnylander.se>, 2006, 2007.
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep 2.5.4-pre4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-07 09:57+0100\n"
+"POT-Creation-Date: 2009-01-23 01:15-0400\n"
+"PO-Revision-Date: 2009-01-23 18:36+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
msgstr "Minnet är slut"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Obalanserad ["
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Oavslutad \\-sekvens"
@@ -35,28 +36,30 @@ msgstr "Oavslutad \\-sekvens"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "oavslutad repetitionsräknare"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "felformaterad repetionsräknare"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Obalanserad ("
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Ingen specificerad syntax"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Obalanserad )"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
msgstr "minnet är slut"
@@ -341,32 +344,30 @@ msgstr "Stoppade behandling av felformulerad GREP_COLORS=\"%s\" på återståend
msgid "unknown devices method"
msgstr "metod för okända enheter"
-#: src/grep.c:1956
+#: src/grep.c:1957
msgid "unknown directories method"
msgstr "okänd metod gällande kataloger"
-#: src/grep.c:2023
+#: src/grep.c:2025
msgid "invalid max count"
msgstr "ogiltigt värde för antal träffar"
-#: src/grep.c:2078
+#: src/grep.c:2080
msgid "unknown binary-files type"
msgstr "okänd binärfiltyp"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Copyright © 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-
#: src/grep.c:2184
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Det här är fri programvara, se källkoden för kopieringsvillkor. Det\n"
-"finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
-"SPECIELLT ÄNDAMÅL.\n"
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl.html>\n"
+"Det här är fri programvara: du får ändra och distribuera den.\n"
+"Det finns INGEN GARANTI, så långt som tillåts enligt lag.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -380,10 +381,14 @@ msgstr "Flaggorna -P och -z kan inte kombineras"
msgid "The -P option only supports a single pattern"
msgstr "Flaggan -P har endast stöd för ett mönster"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Okänt systemfel"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "skrivfel"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -469,6 +474,85 @@ msgstr "\""
msgid "'"
msgstr "\""
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Lyckades"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Ingen matchning"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Ogiltigt reguljärt uttryck"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Ogiltigt sorteringstecken"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Ogiltigt teckenklassnamn"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Efterföljande omvänt snedstreck"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Ogiltig bakåtreferens"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Omatchad [ eller [^"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Omatchad ( eller \\("
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Omatchad \\{"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "Ogiltigt innehåll i \\{\\}"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Ogiltigt intervallslut"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Ogiltigt inledande reguljärt uttryck"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "För tidigt slut på reguljärt uttryck"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Reguljärt uttryck är för stort"
+
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Omatchad ) eller \\)"
+
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Inget tidigare reguljärt uttryck"
+
+#~ msgid "Copyright (C) 2008 Free Software Foundation, Inc.\n"
+#~ msgstr "Copyright © 2008 Free Software Foundation, Inc.\n"
+
+#~ msgid ""
+#~ "This is free software; see the source for copying conditions. There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ msgstr ""
+#~ "Det här är fri programvara, se källkoden för kopieringsvillkor. Det\n"
+#~ "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n"
+#~ "SPECIELLT ÄNDAMÅL.\n"
+
#~ msgid "out of memory"
#~ msgstr "minnet slut"
diff --git a/po/uk.po b/po/uk.po
index 3d84a349..5f130c08 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,7 +2,7 @@
# Copyright (C) 2003 Free Software Foundation, Inc.
# Volodymyr M. Lisivka <lvm@mystery.lviv.net>, 2001-2002.
# Dmytro O. Redchuk <dor@kiev-online.net>, 2002.
-# $Id: uk.po,v 1.2 2007/11/03 04:02:56 taa Exp $
+# $Id: uk.po,v 1.3 2009/02/01 03:11:06 taa Exp $
#
msgid ""
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index c37f7b39..780cf71d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,33 +1,34 @@
# Vietnamese Translation for Grep.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
-#
+# Copyright © 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the grep package.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
+#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.3\n"
+"Project-Id-Version: grep 2.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-03 22:01+0200\n"
-"PO-Revision-Date: 2007-08-05 16:19+0930\n"
+"POT-Creation-Date: 2009-01-26 02:13-0400\n"
+"PO-Revision-Date: 2009-01-30 23:27+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
-#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+#: src/dfa.c:184 src/dfa.c:195 src/dfa.c:206 src/search.c:704 lib/regex.c:1344
msgid "Memory exhausted"
-msgstr "Hết bộ nhó hoàn toàn"
+msgstr "Cạn bộ nhó"
-#: src/dfa.c:536 src/dfa.c:539 src/dfa.c:557 src/dfa.c:568 src/dfa.c:592
-#: src/dfa.c:651 src/dfa.c:656 src/dfa.c:669 src/dfa.c:670 src/dfa.c:1048
-#: src/dfa.c:1051 src/dfa.c:1075 src/dfa.c:1079 src/dfa.c:1080 src/dfa.c:1083
-#: src/dfa.c:1095 src/dfa.c:1096
+#: src/dfa.c:537 src/dfa.c:540 src/dfa.c:558 src/dfa.c:569 src/dfa.c:593
+#: src/dfa.c:652 src/dfa.c:657 src/dfa.c:670 src/dfa.c:671 src/dfa.c:1049
+#: src/dfa.c:1052 src/dfa.c:1076 src/dfa.c:1080 src/dfa.c:1081 src/dfa.c:1084
+#: src/dfa.c:1096 src/dfa.c:1097
msgid "Unbalanced ["
msgstr "Dấu ngoặc vuông mở [ riêng"
-#: src/dfa.c:788
+#: src/dfa.c:789
msgid "Unfinished \\ escape"
msgstr "Chưa kết thúc dãy thoát \\"
@@ -35,34 +36,36 @@ msgstr "Chưa kết thúc dãy thoát \\"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
+#: src/dfa.c:922 src/dfa.c:928 src/dfa.c:938 src/dfa.c:946 src/dfa.c:961
msgid "unfinished repeat count"
msgstr "chưa kết thúc sự đếm lặp lại"
-#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+#: src/dfa.c:935 src/dfa.c:952 src/dfa.c:960 src/dfa.c:964
msgid "malformed repeat count"
msgstr "sự đếm lặp lại dạng sai"
-#: src/dfa.c:1305
+#: src/dfa.c:1306
msgid "Unbalanced ("
msgstr "Dấu ngoặc mở ( riêng"
-#: src/dfa.c:1430
+#: src/dfa.c:1431
msgid "No syntax specified"
msgstr "Chưa ghi rõ cú pháp"
-#: src/dfa.c:1438
+#: src/dfa.c:1439
msgid "Unbalanced )"
msgstr "Dấu ngoặc đóng ) riêng"
-#: src/dfa.c:3008 src/kwset.c:177 src/kwset.c:185 src/kwset.c:408
-#: src/search.c:68 src/search.c:225 lib/obstack.c:471
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted. Goes through gettext.
+#: src/dfa.c:3007 src/kwset.c:178 src/kwset.c:186 src/kwset.c:409
+#: src/search.c:68 src/search.c:225 lib/obstack.c:471 lib/xmalloc.c:66
msgid "memory exhausted"
-msgstr "hết bộ nhớ hoàn toàn"
+msgstr "cạn bộ nhớ"
#: src/grep.c:404
msgid "invalid context length argument"
-msgstr "đối số độ dài ngữ cảnh không hợp lệ"
+msgstr "đối số chiều dài ngữ cảnh không hợp lệ"
#: src/grep.c:665
msgid "input is too large to count"
@@ -75,11 +78,11 @@ msgstr "đang ghi kết xuất"
#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Tập tin nhị phân %s khớp với\n"
+msgstr "Tập tin nhị phân %s tương ứng với\n"
#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(thiết bị nhập chuẩn)"
+msgstr "(đầu vào tiêu chuẩn)"
#: src/grep.c:1355
#, c-format
@@ -88,12 +91,12 @@ msgstr "cảnh báo : %s %s\n"
#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr "vòng lặp thư mục đệ qui"
+msgstr "vòng lặp thư mục đệ quy"
#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Cách sử dụng: %s [TÙY_CHỌN]... MẪU [TẬP_TIN]...\n"
+msgstr "Sử dụng: %s [TÙY_CHỌN]... MẪU [TẬP_TIN]...\n"
#: src/grep.c:1406
#, c-format
@@ -103,7 +106,7 @@ msgstr "Hãy thử lệnh trợ giúp « %s --help » để xem thêm thông tin
#: src/grep.c:1412
#, c-format
msgid "Search for PATTERN in each FILE or standard input.\n"
-msgstr "Tìm kiếm MẪU trong mỗi TẬP_TIN hay thiết bị nhập chuẩn.\n"
+msgstr "Tìm kiếm MẪU trong mỗi TẬP_TIN hay đầu vào tiêu chuẩn.\n"
#: src/grep.c:1415
#, c-format
@@ -223,7 +226,7 @@ msgstr ""
" --line-buffered xoá sách kết xuất trên mỗi dòng\n"
" -H, --with-filename in ra tên tập tin cho mỗi lần khớp\n"
" -h, --no-filename thu hồi tên tập tin tiền tố trong kết xuất\n"
-" --label=NHÃN in ra NHÃN như tên tập tin cho thiết bị nhập chuẩn\n"
+" --label=NHÃN in ra NHÃN như tên tập tin cho đầu vào tiêu chuẩn\n"
" -o, --only-matching hiện chỉ phần dòng khớp MẪU\n"
" -q, --quiet, --silent thu hồi tất cả kết xuất bình thường\n"
" --binary-files=KIỂU giả sử các tập tin nhị phân là KIỂU, mà KIỂU là:\n"
@@ -289,12 +292,12 @@ msgstr ""
#: src/grep.c:1495
#, c-format
msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
-msgstr "Gọi « egrep » bị phản đối nên thay thế bằng « grep -E ».\n"
+msgstr "Gọi như « egrep » bị phản đối nên thay thế bằng « grep -E ».\n"
#: src/grep.c:1498
#, c-format
msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
-msgstr "Gọi « fgrep » bị phản đối nên thay thế bằng « grep -F ».\n"
+msgstr "Gọi như « fgrep » bị phản đối nên thay thế bằng « grep -F ».\n"
#: src/grep.c:1501
#, c-format
@@ -312,7 +315,7 @@ msgid ""
"are given, assume -h. Exit status is 0 if any line was selected, 1 otherwise;\n"
"if any error occurs and -q was not given, the exit status is 2.\n"
msgstr ""
-"Không có TẬP_TIN, hoặc khi TẬP_TIN là « - » thì đọc thiết bị nhập chuẩn.\n"
+"Không có TẬP_TIN, hoặc khi TẬP_TIN là « - » thì đọc đầu vào tiêu chuẩn.\n"
"Đưa ra ít nhất hai tập tin thì giả sử « -h ».\n"
"Trạng thái thoạt là 0 nếu dòng nào được chọn, không thì 1.\n"
"Gặp lỗi khi « -q » không được đặt thì trạng thái thoát là 2.\n"
@@ -330,56 +333,55 @@ msgstr ""
msgid "conflicting matchers specified"
msgstr "đã ghi rõ dữ liệu khớp mà xung đột"
-#: src/grep.c:1715
+#: src/grep.c:1716
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
msgstr "Trong chuỗi « GREP_COLORS=\"%s\" », khả năng \"%s\" cần thiết giá trị (\"=...\"); nên bỏ qua."
-#: src/grep.c:1719
+#: src/grep.c:1720
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
msgstr "Trong chuỗi « GREP_COLORS=\"%s\" », khả năng \"%s\" là luận lý thì không chấp nhận giá trị (\"=%s\"); nên bỏ qua."
-#: src/grep.c:1727
+#: src/grep.c:1729
#, c-format
msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
msgstr "Trong chuỗi « GREP_COLORS=\"%s\" », khả năng \"%s\" %s."
-#: src/grep.c:1750
+#: src/grep.c:1752
#, c-format
msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
msgstr "Đã dừng xử lý chuỗi « GREP_COLORS=\"%s\" » dạng sai ở chuỗi phụ còn lại « %s »."
-#: src/grep.c:1883
+#: src/grep.c:1885
msgid "unknown devices method"
-msgstr "không nhận ra phương pháp thiết bị"
+msgstr "không rõ phương pháp thiết bị"
-#: src/grep.c:1956
+#: src/grep.c:1959
msgid "unknown directories method"
-msgstr "không nhận ra phương pháp thư mục"
+msgstr "không rõ phương pháp thư mục"
-#: src/grep.c:2023
+#: src/grep.c:2027
msgid "invalid max count"
msgstr "số đếm tối đa không hợp lệ"
-#: src/grep.c:2078
+#: src/grep.c:2082
msgid "unknown binary-files type"
-msgstr "không nhận ra kiểu tập tin nhị phân (binary-files)"
+msgstr "không rõ kiểu tập tin nhị phân (binary-files)"
-#: src/grep.c:2182
-#, c-format
-msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
-msgstr "Tác quyền © năm 1988, 1992-2002, 2004, 2005 của Tổ chức Phần mềm Tự do.\n"
-
-#: src/grep.c:2184
+#: src/grep.c:2186
#, c-format
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"
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-"Chương trình này là phần mềm tự do; xem mã nguồn để tìm điều kiện sao chép.\n"
-"KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý\n"
-"KHẢ NĂNG BÁN HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT.\n"
+"Tác quyền © %s Tổ chức Phần mềm Tự do.\n"
+"Giấy phép GPL pb3+: Giấy phép Công cộng GNU phiên bản 3 và sau:\n"
+"<http://gnu.org/licenses/gpl.html>\n"
+"Đây là phần mềm tự do : bạn có quyền sửa đổi và phát hành lại nó.\n"
+"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
#: src/search.c:619
msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
@@ -393,10 +395,14 @@ msgstr "Không thể dùng với nhau hai tùy chọn « -P » và « -z »"
msgid "The -P option only supports a single pattern"
msgstr "Tùy chọn « -P » chỉ hỗ trợ một mẫu riêng lẻ"
-#: lib/error.c:117
+#: src/system.h:52 lib/error.c:117
msgid "Unknown system error"
msgstr "Lỗi hệ thống không rõ"
+#: lib/closeout.c:108
+msgid "write error"
+msgstr "lỗi ghi"
+
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
@@ -478,11 +484,70 @@ msgstr "« "
msgid "'"
msgstr " »"
-#~ msgid "out of memory"
-#~ msgstr "hết bộ nhớ"
+#: lib/regex.c:1308
+msgid "Success"
+msgstr "Thành công"
+
+#: lib/regex.c:1311
+msgid "No match"
+msgstr "Không tìm thấy"
+
+#: lib/regex.c:1314
+msgid "Invalid regular expression"
+msgstr "Biểu thức chính quy không hợp lệ"
+
+#: lib/regex.c:1317
+msgid "Invalid collation character"
+msgstr "Ký tự đối chiếu không hợp lệ"
+
+#: lib/regex.c:1320
+msgid "Invalid character class name"
+msgstr "Tên hạng ký tự không hợp lệ"
+
+#: lib/regex.c:1323
+msgid "Trailing backslash"
+msgstr "Dấu chéo ngược theo sau"
+
+#: lib/regex.c:1326
+msgid "Invalid back reference"
+msgstr "Tham khảo ngược không hợp lệ"
+
+#: lib/regex.c:1329
+msgid "Unmatched [ or [^"
+msgstr "Có ký tự riêng lẻ « [ » hoặc « [^ »"
+
+#: lib/regex.c:1332
+msgid "Unmatched ( or \\("
+msgstr "Có ký tự riêng lẻ « ( » hoặc « \\( »"
+
+#: lib/regex.c:1335
+msgid "Unmatched \\{"
+msgstr "Có ký tự riêng lẻ « \\{ »"
+
+#: lib/regex.c:1338
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} có nội dung sai"
+
+#: lib/regex.c:1341
+msgid "Invalid range end"
+msgstr "Sai kết thức phạm vi"
+
+#: lib/regex.c:1347
+msgid "Invalid preceding regular expression"
+msgstr "Biểu thức chính quy đi trước mà không hợp lệ"
+
+#: lib/regex.c:1350
+msgid "Premature end of regular expression"
+msgstr "Biểu thức chính quy kết thức quá sớm"
+
+#: lib/regex.c:1353
+msgid "Regular expression too big"
+msgstr "Biểu thức chính quy quá lớn"
-#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-#~ msgstr "Cách sử dụng: %s [TÙYCHỌN]... MẪU [TẬPTIN]...\n"
+#: lib/regex.c:1356
+msgid "Unmatched ) or \\)"
+msgstr "Có ký tự riêng lẻ « ) » hoặc « \\) »"
-#~ msgid "%s (GNU grep) %s\n"
-#~ msgstr "%s (trình grep của GNU) %s\n"
+#: lib/regex.c:7583
+msgid "No previous regular expression"
+msgstr "Không có biểu thức chính quy nằm trước"