summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorTony Abou-Assaleh <taa@acm.org>2007-11-03 04:02:53 +0000
committerTony Abou-Assaleh <taa@acm.org>2007-11-03 04:02:53 +0000
commitac120d299e9eb4af41161b01619af4f56a555098 (patch)
tree8c5fe6ef97f7e42048269c6b3acd60dd0379e18f /po
parentecf2d276aec49d96ce9973a0f05aadcc39f25274 (diff)
downloadgrep-ac120d299e9eb4af41161b01619af4f56a555098.tar.gz
* po/*.po: get latest translations
* po/no.po: removed * po/ky.po: added * po/ky.po: added
Diffstat (limited to 'po')
-rw-r--r--po/af.po57
-rw-r--r--po/be.po57
-rw-r--r--po/bg.po61
-rw-r--r--po/ca.po61
-rw-r--r--po/cs.po448
-rw-r--r--po/da.po289
-rw-r--r--po/de.po59
-rw-r--r--po/el.po61
-rw-r--r--po/eo.po257
-rw-r--r--po/es.po61
-rw-r--r--po/fi.po425
-rw-r--r--po/ga.po316
-rw-r--r--po/gl.po61
-rw-r--r--po/hr.po61
-rw-r--r--po/hu.po61
-rw-r--r--po/id.po61
-rw-r--r--po/ja.po61
-rw-r--r--po/ko.po403
-rw-r--r--po/ky.po475
-rw-r--r--po/nb.po57
-rw-r--r--po/nl.po344
-rw-r--r--po/no.po423
-rw-r--r--po/pl.po258
-rw-r--r--po/pt.po57
-rw-r--r--po/pt_BR.po61
-rw-r--r--po/ro.po57
-rw-r--r--po/ru.po61
-rw-r--r--po/rw.po62
-rw-r--r--po/sk.po465
-rw-r--r--po/sl.po345
-rw-r--r--po/sr.po57
-rw-r--r--po/sv.po400
-rw-r--r--po/uk.po59
-rw-r--r--po/vi.po456
-rw-r--r--po/zh_TW.po57
35 files changed, 3761 insertions, 2793 deletions
diff --git a/po/af.po b/po/af.po
index 29a92061..23eca146 100644
--- a/po/af.po
+++ b/po/af.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2004-03-03 13:33+0200\n"
"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -60,8 +60,8 @@ msgstr "Ongebalanseerde )"
msgid "out of memory"
msgstr "te min geheue"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "geheue uitgeput"
@@ -69,48 +69,48 @@ msgstr "geheue uitgeput"
msgid "invalid context length argument"
msgstr "ongeldige konteks-lengte-parameter"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "toevoer is te veel om te tel"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "afvoer word geskryf"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binre ler %s pas\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standaardtoevoer)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "waarskuwing: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "rekursiewe lus van gidsinskrywings"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Gebruik so: %s [OPSIE]... PATROON [LER]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer `%s --help' vir meer inligting.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Gebruik so: %s [OPSIE]... PATROON [LER] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -123,7 +123,7 @@ msgstr ""
"\n"
"Relmatige uitdrukking-seleksie en -interpretasie:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -135,7 +135,7 @@ msgstr ""
" -G, --basic-regexp PATROON is 'n basic regular expression\n"
" -P, --perl-regexp PATROON is 'n Perl regular expression\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -151,7 +151,7 @@ msgstr ""
" -x, --line-regexp dwing PATROON om slegs op hele rels te pas\n"
" -z, --null-data elke datarel eindig met 'n 0-greep, nie 'n nuwerelkarakter nie\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -169,7 +169,7 @@ msgstr ""
" --help wys hierdie hulpboodskap en stop\n"
" --mmap gebruik geheue-gebonde toevoer indien moontlik\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -227,7 +227,7 @@ msgstr ""
" -c, --count wys slegs die aantal rels in elke LER wat passings bevat\n"
" -Z, --null wys die 0-greep na die LERnaam\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -263,45 +263,44 @@ msgstr ""
"Indien minder as twee LERs gegee is, aanvaar -h. Uittreestatus is\n"
" 0 vir passing, 1 vir geen passing, en 2 vir probleemgevalle.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Rapporteer foute aan <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "teenstrydige passers is gespesifiseer"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "onbekende metode vir toestelle"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "onbekende metode vir gidse"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "ongeldige maks-telling"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "onbekende binre-lertipe"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/be.po b/po/be.po
index 0b998237..1c091ec4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2003-07-22 17:18+0300\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -56,8 +56,8 @@ msgstr "Неўраўнаважаная )"
msgid "out of memory"
msgstr "нехапае памяці"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "памяць вычарпана"
@@ -65,48 +65,48 @@ msgstr "памяць вычарпана"
msgid "invalid context length argument"
msgstr "недапушчальны довад даўжыні кантэксту"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "увод занадта вялікі для падліку"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "запісваецца вывад"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Супадзеньні двайковага файла %s\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(стандартны ўвод)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "Увага! %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "тэчкі зацыклены"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Выкарыстаньне: %s [ВЫБАР]... УЗОР [ФАЙЛ]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Выкарыстаньне: %s [ВЫБАР]... УЗОР [ФАЙЛ] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"Выбар і тлумачэньне выразаў:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,7 +132,7 @@ msgstr ""
" -G, --basic-regexp УЗОР - гэта асноўны сталы выраз.\n"
" -P, --perl-regexp УЗОР - гэта сталы выраз на Perl.\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -150,7 +150,7 @@ msgstr ""
" -z, --null-data Радок даньняў павінен мець канчатак ў выглядзе\n"
" нулявога байта, замест знака новага радка.\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,7 +168,7 @@ msgstr ""
" --help Адлюстраваць гэтую даведку й выйсьці.\n"
" --mmap Выкарыстоўваць memory-mapped, калі гэта магчыма.\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -234,7 +234,7 @@ msgstr ""
" -c, --count Друкаваць толькі колькасьць супаўшых радкоў на файл.\n"
" -Z, --null Друкаваць 0-ы байт пасьля назвы файла.\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -272,45 +272,44 @@ msgstr ""
"Калі заданы менш чым два файла, працуе як у выпадку выбара -h. Стан выхаду\n"
"роўны 0, калі ё супадзеньні, 1, калі супадзеньняў няма й 2 у выпадку памылкі.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Паведамляйце пра памылкі на <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "заданы супярэчлівыя супадальнікі"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "невядомы мэтад пралад"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "невядомы мэтад тэчак"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "недапушчальны найбольшы лічыльнік"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "невядомы від дваічнага файла"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr " Аўтарскія правы © 1988, 1992-2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/bg.po b/po/bg.po
index a31d0e16..4fc05e06 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-03-09 02:00+0200\n"
"Last-Translator: Pavel Mihaylov <avatarbg@bulgaria.com>\n"
"Language-Team: Bulgarian <bg@bulgaria.com>\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Паметта е изчерпана"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "Небалансирана ["
@@ -56,8 +53,7 @@ msgstr "Небалансирана )"
msgid "out of memory"
msgstr "недостатъчна памет"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "паметта е изчерпана"
@@ -65,48 +61,48 @@ msgstr "паметта е изчерпана"
msgid "invalid context length argument"
msgstr "невалиден размер на контекста"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "входните данни са прекалено големи за да бъдат преброени"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "записване на изходните данни"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Двоичен файл %s съвпада\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(стандартен вход)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "предупреждение: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "рекурсивна обработка на директориите"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Употреба: %s [ОПЦИЯ]... ТЕКСТ [ФАЙЛ]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Вижте `%s --help' за повече информация.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Употреба: %s [ОПЦИЯ]... ТЕКСТ [ФАЙЛ]...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Избор на типа регулярен израз и интерпретация:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp ТЕКСТ е прост регулярен израз\n"
" -P, --perl-regexp ТЕКСТ е Perl регулярен израз\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -148,7 +144,7 @@ msgstr ""
" -z, --null-data редовете във ФАЙЛ завършват с 0 (NULL),\n"
" а не със символ за нов ред (LF)\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,7 +162,7 @@ msgstr ""
" --help показва помощна информация и излиза\n"
" --mmap използва memory-mapped вход ако е възможно\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -232,7 +228,7 @@ msgstr ""
" за всеки файл\n"
" -Z, --null извежда символ NULL след всяко име на файл\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -267,45 +263,44 @@ msgstr ""
"Ако са зададени по-малко от два ФАЙЛа се предполага -h.\n"
"При изход grep връща 0 ако има съвпадение, 1 ако няма и 2 при грешка.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"За програмни грешки съобщавайте на <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "зададените изрази за съвпадение са в конфликт"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "неизвестен метод за обработка на специалните файлове"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "неизвестен метод за обработка на директориите"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "невалиден максимален брой"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "непознат тип двоичен файл"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ca.po b/po/ca.po
index 68f4225f..54840586 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-03-11 15:46+0100\n"
"Last-Translator: Enric Alberola Rosell <enricalberola@wanadoo.es>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -16,10 +16,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memria exhaurida"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ desaparellat"
@@ -55,8 +52,7 @@ msgstr ") desaparellat"
msgid "out of memory"
msgstr "sense memria"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memria exhaurida"
@@ -64,48 +60,48 @@ msgstr "memria exhaurida"
msgid "invalid context length argument"
msgstr "longitud del context invlida"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "l'entrada s massa llarga per a comptar"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "escrivint eixida"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Concidncia en el fitxer binari %s\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entrada estndard)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "avs: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "bucle de directori recursiu"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "s: %s [OPCI]... PATR [FITXER] ...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Proveu amb \"%s --help\" per a obtenir ms informaci.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "s: %s [OPCI]... PATR [FITXER] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -118,7 +114,7 @@ msgstr ""
"\n"
"Selecci i interpretaci de l'expressi regular:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp PATR s un expressi regular bsica\n"
" -P, --perl-regexp PATR s un expressi regular de Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -150,7 +146,7 @@ msgstr ""
" -z, --null-data considera que una lnia de dades acaba amb el\n"
" byte 0 i no amb el carcter de nova lnia\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -169,7 +165,7 @@ msgstr ""
" --mmap si s possible utilitza com a entrada la\n"
" memria assignada\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -234,7 +230,7 @@ msgstr ""
" per fitxer\n"
" -Z, --null imprimeix un byte 0 desprs del nom del fitxer\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -274,45 +270,44 @@ msgstr ""
"s'han trobat coincidncies, 1 si no hi han i 2 en cas d'haver tingut algun\n"
"problema.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Podeu notificar els errors del programa a <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "s'han especificat expressions conflictives"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "mtode de dispositius desconegut"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mtode de directoris desconegut"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "comptador mxim invlid"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipus de fitxer binari desconegut"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/cs.po b/po/cs.po
index a482feec..ae688722 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,156 +3,170 @@
# Vladimir Michl <Vladimir.Michl@seznam.cz>, 1998.
#
# Thanks to: Stanislav Brabec <utx@k332.feld.cvut.cz>
-# Note: 2 messages untranslated, it's OK.
-#
+# 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.5e\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2001-08-04 12:01+02:00\n"
+"Project-Id-Version: grep 2.5.3\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"
-"Language-Team: Czech <cs@li.org>\n"
+"Language-Team: Czech <translation-team-cs@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: 8bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
-msgstr "Pame vyerpna"
+msgstr "Pameť vyčerpána"
-#: 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: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
msgid "Unbalanced ["
-msgstr "Lich poet ["
+msgstr "Lichý počet ["
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
-msgstr "Za \\ chyb znak"
+msgstr "Za \\ chybí znak"
#. 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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
-msgstr "neukonen zpis potu opakovn"
+msgstr "neukončený zápis počtu opakování"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
-msgstr "deformovan zpis potu opakovn"
+msgstr "deformovaný zápis počtu opakování"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
-msgstr "Lich poet ("
+msgstr "Lichý počet ("
-# ? Nen zadan syntaxe
-#: src/dfa.c:1378
+# ? Není zadaná syntaxe
+#: src/dfa.c:1430
msgid "No syntax specified"
-msgstr "Syntaxe nen urena"
+msgstr "Syntaxe není určena"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
-msgstr "Lich poet )"
-
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "nedostatek voln pamti"
+msgstr "Lichý počet )"
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
-msgstr "pam vyerpna"
+msgstr "paměť vyčerpána"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
-msgstr "neplatn argument dlky kontextu"
+msgstr "neplatný argument délky kontextu"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "poet vstupnch dk nelze spotat (je jich hodn)"
+msgstr "počet vstupních řádků nelze spočítat (je jich hodně)"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
-msgstr "zapisuje se vstup"
+msgstr "zapisuje se výstup"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Binrn soubor %s odpovd\n"
+msgstr "Binární soubor %s odpovídá\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(standardn vstup)"
+msgstr "(standardní vstup)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
-msgstr "varovn: %s: %s\n"
+msgstr "varování: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
-msgstr "smyka pro rekurzivn prchod"
+msgstr "smyčka pro rekurzivní průchod"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Pouit: %s [PEPNA]... VZOREK [SOUBOR]...\n"
+msgstr "Použití: %s [PŘEPÍNAČ]... VZOREK [SOUBOR]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Vce informac zskte pkazem `%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"
+"ze všech zadaných SOUBORů nebo ze standardního vstupu.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "VZOREK představuje rozšířený regulární výraz (ERE).\n"
-#: src/grep.c:1053
+#: src/grep.c:1418
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Pouit: %s [PEPNA]... VZOREK [SOUBOR]...\n"
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "VZOREK představuje množinu řetězců, každý na novém řádku.\n"
-#: src/grep.c:1054
+#: src/grep.c:1421
+#, c-format
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "VZOREK představuje základní regulární výraz (BRE), pokud není řečeno jinak.\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 ""
-" Hled dky, jejich nkter sti vyhovuj VZORKu. dky jsou teny postupn\n"
-"ze vech zadanch SOUBOR nebo ze standardnho vstupu.\n"
-"Pklad: %s -i 'hello world' menu.h main.c\n"
+"Příklad: %s -i 'hello world' menu.h main.c\n"
"\n"
-"Vbr a interpretace regulrnho vrazu:\n"
+"Výběr a interpretace regulárního výrazu:\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 VZOREK je rozen regulrn vraz\n"
-" -F, --fixed-strings VZOREK je mnoina etzc, kad na jednom dku\n"
-" -G, --basic-regexp VZOREK je zkladn regulrn vraz\n"
-" -P, --perl-regexp VZOREK je regulrn vraz Perlu\n"
+" -E, --extended-regexp VZOREK je rozšířený regulární výraz (ERE)\n"
+" -F, --fixed-strings VZOREK je množina řetězců, každý na jednom řádku\n"
+" -G, --basic-regexp VZOREK je základní regulární výraz (BRE)\n"
+" -P, --perl-regexp VZOREK je regulární výraz z jazyka 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=VZOREK pouije VZOREK jako regulrn vraz\n"
-" -f, --file=SOUBOR nate VZOREK ze SOUBORu\n"
-" -i, --ignore-case ignoruje rozdl mezi velikost psmen\n"
-" -w, --word-regexp VZOREK bude aplikovn pouze na cel slova\n"
-" -x, --line-regexp VZOREK bude aplikovn pouze na cel dky\n"
-" -z, --null-data dek kon nulovm bajtem msto znaku novho dku\n"
-
-#: src/grep.c:1071
+" -e, --regexp=VZOREK použije VZOREK jako regulární výraz\n"
+" -f, --file=SOUBOR načte VZOREK ze SOUBORu\n"
+" -i, --ignore-case ignoruje rozdíl mezi velikostí písmen\n"
+" -w, --word-regexp VZOREK bude aplikován pouze na celá slova\n"
+" -x, --line-regexp VZOREK bude aplikován pouze na celé řádky\n"
+" -z, --null-data řádek končí nulovým bajtem místo znaku nového řádku\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -163,15 +177,15 @@ msgid ""
" --mmap use memory-mapped input if possible\n"
msgstr ""
"\n"
-"Rzn:\n"
-" -s, --no-messages potla chybov zprvy\n"
-" -v, --invert-match vype dky, kter VZORKu nevyhovuj\n"
-" -V, --version vype oznaen verze a skon\n"
-" --help vype tuto npovdu a skon\n"
-" --mmap kdy to jde, namapuje vstup do pamti\n"
-
-#: src/grep.c:1079
-#, fuzzy
+"Různé:\n"
+" -s, --no-messages potlačí chybové zprávy\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"
+
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -184,53 +198,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"
-"zen vstupu:\n"
-" -m, --max-count=SLO skon, pokud najde SLO vraz\n"
-" -b, --byte-offset s kadm vstupnm dkem vype jeho pozici\n"
+"Řízení výstupu:\n"
+" -m, --max-count=ČÍSLO skončí, pokud najde ČÍSLO výrazů\n"
+" -b, --byte-offset s každým výstupním řádkem vypíše jeho pozici\n"
" v souboru\n"
-" -n, --line-number s kadm vstupnm dkem vype jeho slo dku\n"
-" --line-buffered vyprzdn vstup po kadm dku\n"
-" -H, --with-filename s kadm vstupnm dkem vype jmno souboru\n"
-" -h, --no-filename potla vypisovn jmna souboru s vst. dkem\n"
-" -q, --quiet, --silent potla obvykl vstup\n"
-" --binary-files=TYP definuje typ binrnch soubor\n"
-" TYP me bt: 'binary', 'text' nebo 'without-match'\n"
+" -n, --line-number s každým výstupním řádkem vypíše jeho číslo řádku\n"
+" --line-buffered vyprázdní výstup po každém řádku\n"
+" -H, --with-filename s každým výstupním řádkem vypíše jméno souboru\n"
+" -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"
+" -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"
" -a, --text jako --binary-files=text\n"
" -I jako --binary-files=without-match\n"
-" -d, --directories=AKCE jak zpracovvat adrese. AKCE me bt:\n"
-" `read', `recurse', `skip'\n"
+" -d, --directories=AKCE jak zpracovávat adresáře. AKCE může být:\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"
" -R, -r, --recursive jako --directories=recurse\n"
-" --include=VZOREK soubory kter vyhovuj vzorku, budou zpracovny\n"
-" --exclude=VZOREK soubory kter vyhovuj vzorku, budou peskoeny\n"
-" --exclude-from=SOUBOR soubory kter vyhovuj vzorkm ze SOUBORu, budou\n"
-" peskoeny\n"
-" -L, --files-without-match vype pouze jmna soubor, ve kterch nebyl\n"
+" --include=VZOREK soubory které vyhovují vzorku, budou zpracovány\n"
+" --exclude=VZOREK soubory které vyhovují vzorku, budou přeskočeny\n"
+" --exclude-from=SOUBOR soubory které vyhovují vzorkům ze SOUBORu, budou\n"
+" přeskočeny\n"
+" --exclude-dir=VZOREK adresáře které vyhovují vzorku, budou přeskočeny\n"
+" -L, --files-without-match vypíše pouze jména souborů, ve kterých nebyl\n"
" VZOREK nalezen\n"
-" -l, --files-with-matches vype pouze jmna soubor, ve kterch byl VZOREK\n"
+" -l, --files-with-matches vypíše pouze jména souborů, ve kterých byl VZOREK\n"
" nalezen\n"
-" -c, --count vype pouze poet vyhovujcch dk na SOUBOR\n"
-" -Z, --null vype nulov bajt za jmnem SOUBORu\n"
+" -c, --count vypíše pouze počet vyhovujících řádků na SOUBOR\n"
+" -T, --initial-tab zarovnání začátků řádků tabulátory (je-li třeba)\n"
+" -Z, --null vypíše nulový bajt za jménem SOUBORu\n"
-#: src/grep.c:1107
-#, fuzzy
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -239,153 +264,198 @@ 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"
-"zen kontextu:\n"
-" -B, --before-context=POET vype POET dk ped vyhovujcm\n"
-" -A, --after-context=POET vype POET dk za vyhovujcm\n"
-" -C, --context=[POET] vype POET (2) dk kontextu (ped\n"
-" i za vyhovujcm). Je potlaeno pepnai -A a -B\n"
-" -POET stejn se zadnm --context=NUM\n"
-" --color, --colour pouije barev k rozlien vyhovujcch etzc\n"
-" -U, --binary neodstrauje znak CR na konci dku (MSDOS)\n"
-" -u, --unix-byte-offsets vypisuje pozici jako by CR nebyly v souboru (MSDOS)\n"
+"Řízení kontextu:\n"
+" -B, --before-context=POČET vypíše POČET řádků před vyhovujícím\n"
+" -A, --after-context=POČET vypíše POČET řádků za vyhovujícím\n"
+" -C, --context=POČET vypíše POČET řádků kontextu (před\n"
+" i za vyhovujícím). Je potlačeno přepínači -A a -B\n"
+" -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"
+" -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"
-" Jestlie nen zadn dn z pepna -[GEF], pak `egrep' pracuje jako\n"
-"`grep -E', `fgrep' jako `grep -F' a `grep' jako `grep -G'. Jestlie SOUBOR\n"
-"nen zadn, nebo je -, je ten standardn vstup. Jestlie jsou zadny\n"
-"mn ne dva SOUBORy, pak je implicitn parametr -h.\n"
-" Nvratov kd je 0 pi nalezen, 1 nevyhovoval-li dn dek a 2 pi\n"
-"syntaktick nebo systmov chyb.\n"
-
-#: src/grep.c:1124
-#, fuzzy
+
+#: 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"
+
+#: 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"
+
+#: 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' znamená 'grep -E'. 'fgrep' znamená 'grep -F'.\n"
+"Přímé spustění příkazem 'egrep' nebo 'fgrep' je zastaralé.\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 ""
+"Jestliže SOUBOR není zadán, nebo je -, je čten standardní vstup.\n"
+"Jestliže jsou zadány méně než dva SOUBORy, pak je implicitní parametr -h.\n"
+" Návratový kód je 0 při nalezení vyhovujícího řádku, 1 nevyhovoval-li žádný\n"
+"řádek a nebo 2 v případě nějakého problému.\n"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-" Chyby v programu oznamujte na adrese <bug-gnu-utils@gnu.org> (pouze\n"
-"anglicky), pipomnky k pekladu zaslejte na adresu <cs@li.org> (esky).\n"
+" Chyby v programu oznamujte na adrese <%s> (pouze\n"
+"anglicky), připomínky k překladu zasílejte na adresu\n"
+"<translation-team-cs@lists.sourceforge.net> (česky).\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
-msgstr "zadny kolidujc vzorky"
+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 ""
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr ""
-#: src/grep.c:1376
-#, fuzzy
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr ""
+
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr ""
+
+#: src/grep.c:1883
msgid "unknown devices method"
-msgstr "neznm obsluha adres"
+msgstr "neznámá metoda obsluhy zařízení"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
-msgstr "neznm obsluha adres"
+msgstr "neznámá metoda obsluhy adresářů"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
-msgstr "neplatn maximln poet"
+msgstr "neplatný maximální počet"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
-msgstr "neznm typ binrnho souboru"
+msgstr "neznámý typ binárního souboru"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %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"
+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:1664
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-" Toto je voln programov vybaven; podmnky pro koprovn a roziovn\n"
-"naleznete ve zdrojovch textech. Toto programov vybaven je zcela BEZ ZRUKY,\n"
-"a to i bez zruky PRODEJNOSTI nebo VHODNOSTI PRO NJAK KONKRTN EL.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Pepna -P nen podporovn"
+"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"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Volba -P není podporována. Tento program byl přeložen s --disable-perl-regexp."
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "Pepnae -P a -z nemohou bt kombinovny"
+msgstr "Přepínače -P a -z nemohou být kombinovány"
+
+#: src/search.c:634
+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
msgid "Unknown system error"
-msgstr "Neznm systmov chyba"
+msgstr "Neznámá systémová chyba"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: pepna `%s' nen jednoznan\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: pepna `--%s' mus bt zadn 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: pepna `%c%s' mus bt zadn 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: pepna `%s' vyaduje 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: neznm pepna `--%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: neznm pepna `%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
#, c-format
msgid "%s: illegal option -- %c\n"
-msgstr "%s: neznm pepna -- %c\n"
+msgstr "%s: neznámý přepínač -- %c\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: neznm pepna -- %c\n"
+msgstr "%s: neznámý přepínač -- %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: pepna vyaduje argument -- %c\n"
+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: pepna `-W %s' nen jednoznan\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: pepna `-W %s' mus bt zadn 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.
#.
diff --git a/po/da.po b/po/da.po
index ebd04dc1..9bbe1b8d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.4f.da.po\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2000-02-02 01:04-0500\n"
"PO-Revision-Date: 2000-10-14 02:04+02:00\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,18 +14,11 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:163 src/dfa.c:174 src/dfa.c:185 src/grep.c:902
msgid "Memory exhausted"
msgstr "Hukommelse opbrugt"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "Ubalanceret ["
-
-#: src/dfa.c:741
+#: src/dfa.c:448
msgid "Unfinished \\ escape"
msgstr "Ufrdig \\-beskyttelse"
@@ -33,81 +26,137 @@ msgstr "Ufrdig \\-beskyttelse"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:581 src/dfa.c:587 src/dfa.c:597 src/dfa.c:605 src/dfa.c:620
msgid "unfinished repeat count"
msgstr "ufrdigt gentagelsesantal"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:594 src/dfa.c:611 src/dfa.c:619 src/dfa.c:623
msgid "malformed repeat count"
msgstr "ugyldigt gentagelsesantal"
-#: src/dfa.c:1253
+#: src/dfa.c:688 src/dfa.c:691 src/dfa.c:718 src/dfa.c:722 src/dfa.c:723
+#: src/dfa.c:726 src/dfa.c:739 src/dfa.c:740
+msgid "Unbalanced ["
+msgstr "Ubalanceret ["
+
+#: src/dfa.c:886
msgid "Unbalanced ("
msgstr "Ubalanceret ("
-#: src/dfa.c:1378
+#: src/dfa.c:1000
msgid "No syntax specified"
msgstr "Ingen syntaks angivet"
-#: src/dfa.c:1386
+#: src/dfa.c:1008
msgid "Unbalanced )"
msgstr "Ubalanceret )"
-#: src/dfa.c:2956
+#: src/dfa.c:1994
msgid "out of memory"
msgstr "ikke nok hukommelse"
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
-msgid "memory exhausted"
-msgstr "hukommelse opbrugt"
+#: src/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flaget '%s' er flertydigt\n"
-#: src/grep.c:205
-msgid "invalid context length argument"
-msgstr "ugyldigt kontekstlngdeargument"
+#: src/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flaget '--%s' tillader ikke argumenter\n"
-#: src/grep.c:479
-msgid "input is too large to count"
-msgstr ""
+#: src/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flaget '%c%s' tillader ikke argumenter\n"
+
+#: src/getopt.c:723 src/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flaget '%s' krver et argument\n"
+
+#. --option
+#: src/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukendt flag '--%s'\n"
+
+#. +option or -option
+#: src/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukendt flag '%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovligt flag -- %c\n"
+
+#: src/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldigt flag -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:815 src/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaget krver et argument -- %c\n"
-#: src/grep.c:605
+#: src/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flaget '-W %s' er flertydigt\n"
+
+#: src/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flaget '-W %s' tillader ikke argumenter\n"
+
+#: src/grep.c:185 src/grep.c:200 src/grep.c:293 src/grep.c:399 src/kwset.c:180
+#: src/kwset.c:186 src/obstack.c:471
+msgid "memory exhausted"
+msgstr "hukommelse opbrugt"
+
+#: src/grep.c:550 src/grep.c:1441
msgid "writing output"
msgstr "skriver uddata"
-#: src/grep.c:878
+#: src/grep.c:777
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binr fil %s stemmer\n"
-#: src/grep.c:892
+#: src/grep.c:791
msgid "(standard input)"
msgstr "(standard inddata)"
-#: src/grep.c:997
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
+#: src/grep.c:887
+#, c-format
+msgid "%s: warning: %s: %s\n"
msgstr "%s: advarsel: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:888
msgid "recursive directory loop"
msgstr "rekursiv katalogsljfe"
-#: src/grep.c:1046
+#: src/grep.c:938
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Brug: %s [FLAG]... MNSTER [FIL]...\n"
-#: src/grep.c:1048
+#: src/grep.c:939
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prv '%s --help' for mere information.\n"
-#: src/grep.c:1053
+#: src/grep.c:943
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Brug: %s [FLAG]... MNSTER [FIL] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:944
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,19 +169,17 @@ msgstr ""
"\n"
"Regexp tilvalg og betydning:\n"
-#: src/grep.c:1059
-#, fuzzy
+#: src/grep.c:949
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr ""
" -E, --extended-regexp MNSTER er et udvidet regulrt udtryk\n"
" -F, --fixed-strings MNSTER er et st af nylinje-separerede strenge\n"
" -G, --basic-regexp MNSTER er et basalt regulrt udtryk\n"
-#: src/grep.c:1064
+#: src/grep.c:953
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -148,7 +195,7 @@ msgstr ""
" -x, --line-regexp f MNSTER til at passe kun p hele linjer\n"
" -z, --null-data en datalinje slutter med en 0 byte, ikke ny linje\n"
-#: src/grep.c:1071
+#: src/grep.c:960
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,32 +213,22 @@ msgstr ""
" --help vis denne hjlpetekst og afslut\n"
" --mmap brug inddata via hukommelse om muligt\n"
-#: src/grep.c:1079
-#, fuzzy
+#: src/grep.c:968
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
-" --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"
+" TYPE is 'binary', 'text', or 'without-match'.\n"
" -a, --text equivalent to --binary-files=text\n"
" -I equivalent to --binary-files=without-match\n"
" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
-" ACTION is 'read' or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
@@ -216,18 +253,15 @@ msgstr ""
" -c, --count udskriv kun antal af linjer med trffere per FIL\n"
" -Z, --null udskriv en 0 byte efter FIL navn\n"
-#: src/grep.c:1107
-#, fuzzy
+#: src/grep.c:987
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overridden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color[=WHEN],\n"
-" --colour[=WHEN] use markers to distinguish the matching string\n"
-" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
@@ -251,48 +285,36 @@ msgstr ""
"to FILer er angivet, antag -h. Afslutningsstatus er 0 ved trffer, 1 ved ingen trffer,\n"
"og 2 ved problemer.\n"
-#: src/grep.c:1124
-#, fuzzy
-msgid ""
-"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
-msgstr ""
-"\n"
-"Rapportr fejl til <bug-gnu-utils@gnu.org>.\n"
+#: src/grep.c:1002
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
+msgstr "\nRapportr fejl til <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1012
msgid "conflicting matchers specified"
msgstr "konfliktende sgeudtryk angivet"
-#: src/grep.c:1376
-#, fuzzy
-msgid "unknown devices method"
-msgstr "ukendt katalogmetode"
+#: src/grep.c:1203 src/grep.c:1210 src/grep.c:1219
+msgid "invalid context length argument"
+msgstr "ugyldigt kontekstlngdeargument"
-#: src/grep.c:1443
+#: src/grep.c:1273
msgid "unknown directories method"
msgstr "ukendt katalogmetode"
-#: src/grep.c:1510
-#, fuzzy
-msgid "invalid max count"
-msgstr "ufrdigt gentagelsesantal"
-
-#: src/grep.c:1565
+#: src/grep.c:1358
msgid "unknown binary-files type"
msgstr "ukendt binr filtype"
-#: src/grep.c:1660
+#: src/grep.c:1378
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
-#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+#: src/grep.c:1380
+msgid "Copyright 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
msgstr "Ophavsret 1988, 1992-1999, 2000 Free Software Foundation, Inc.\n"
-#: src/grep.c:1664
+#: src/grep.c:1382
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -300,96 +322,3 @@ msgstr ""
"Dette er frit programmel, se kildekoden for kopieringsbetingelser. Der\n"
"er INGEN garanti, ikke engang for SALGBARHED eller EGNETHED FOR NOGET \n"
"SPECIELT FORML.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flaget '%s' er flertydigt\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flaget '--%s' tillader ikke argumenter\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flaget '%c%s' tillader ikke argumenter\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flaget '%s' krver et argument\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukendt flag '--%s'\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukendt flag '%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovligt flag -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldigt flag -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flaget krver et argument -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flaget '-W %s' er flertydigt\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flaget '-W %s' tillader ikke argumenter\n"
-
-#. Get translations for open and closing quotation marks.
-#.
-#. The message catalog should translate "`" to a left
-#. quotation mark suitable for the locale, and similarly for
-#. "'". If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
-#.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK). A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
diff --git a/po/de.po b/po/de.po
index 1e945b66..4edaabfa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-03-13 15:14+0100\n"
"PO-Revision-Date: 2002-03-26 21:16+0100\n"
"Last-Translator: Martin von Lwis <martin@v.loewis.de>\n"
"Language-Team: German <de@li.org>\n"
@@ -19,10 +19,7 @@ msgstr "Virtueller Speicher erschpft."
# Is this message used only for [ without matching ],
# or for ] without [ as well?
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "ffnende [ ohne schlieende."
@@ -58,8 +55,7 @@ msgstr "Schlieende ) ohne ffnende."
msgid "out of memory"
msgstr "Speicher ist alle."
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293 lib/obstack.c:471
msgid "memory exhausted"
msgstr "Virtueller Speicher erschpft."
@@ -71,44 +67,44 @@ msgstr "Ungltige Kontextlnge."
msgid "input is too large to count"
msgstr "Eingabe ist zu gro, um gezhlt zu werden."
-#: src/grep.c:605
+#: src/grep.c:601
msgid "writing output"
msgstr "Politik, "
-#: src/grep.c:878
+#: src/grep.c:874
#, c-format
msgid "Binary file %s matches\n"
msgstr "bereinstimmungen in Binrdatei %s.\n"
-#: src/grep.c:892
+#: src/grep.c:888
msgid "(standard input)"
msgstr "(Standardeingabe)"
-#: src/grep.c:997
+#: src/grep.c:993
#, c-format
msgid "warning: %s: %s\n"
msgstr "Warnung: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:994
msgid "recursive directory loop"
msgstr "Rekursive Verzeichnisschleife."
-#: src/grep.c:1046
+#: src/grep.c:1042
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1044
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "%s --help gibt Ihnen mehr Informationen.\n"
-#: src/grep.c:1053
+#: src/grep.c:1049
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1050
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,7 +117,7 @@ msgstr ""
"\n"
"Auswahl und Interpretation regulrer Ausdrcke:\n"
-#: src/grep.c:1059
+#: src/grep.c:1055
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -135,7 +131,7 @@ msgstr ""
" -P, --perl-regexp MUSTER ist ein regulrer Ausdruck, \n"
" wie Perl ihn akzeptiert.\n"
-#: src/grep.c:1064
+#: src/grep.c:1060
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -152,7 +148,7 @@ msgstr ""
" -x, --line-regexp MUSTER pat nur auf ganze Zeilen.\n"
" -z, --null-data Eine Zeile endet mit Nullbyte, nicht Newline.\n"
-#: src/grep.c:1071
+#: src/grep.c:1067
msgid ""
"\n"
"Miscellaneous:\n"
@@ -170,7 +166,7 @@ msgstr ""
" --help Diese Hilfe ausgeben und beenden.\n"
" --mmap Wenn mglich, Eingabe in den Speicher mappen.\n"
-#: src/grep.c:1079
+#: src/grep.c:1075
msgid ""
"\n"
"Output control:\n"
@@ -231,7 +227,7 @@ msgstr ""
" -c, --count Nur Zahl der passenden Zeilen pro Datei ausgeben.\n"
" -Z, --null Null-Byte nach jedem Dateinamen ausgeben.\n"
-#: src/grep.c:1107
+#: src/grep.c:1103
msgid ""
"\n"
"Context control:\n"
@@ -267,45 +263,44 @@ msgstr ""
"Weniger als zwei DATEIen implizieren -h. Status ist 0 bei \n"
"bereinstimmungen, 1 ohne, 2 bei Problemen.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1120
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Fehlerberichte bitte an <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1130
msgid "conflicting matchers specified"
msgstr "Festgelegte Vergleicher widersprechen einander."
-#: src/grep.c:1376
+#: src/grep.c:1367
msgid "unknown devices method"
msgstr "Unbekannte Methode fr Gertedateien."
-#: src/grep.c:1443
+#: src/grep.c:1434
msgid "unknown directories method"
msgstr "Unbekannte Methode fr Verzeichnisse."
-#: src/grep.c:1510
+#: src/grep.c:1501
msgid "invalid max count"
msgstr "Unbeendeter Maximalzhler."
-#: src/grep.c:1565
+#: src/grep.c:1555
msgid "unknown binary-files type"
msgstr "Unbekannter Typ fr --binary-files."
-#: src/grep.c:1660
+#: src/grep.c:1650
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: src/grep.c:1652
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
+#: src/grep.c:1654
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/el.po b/po/el.po
index 73867847..eade9080 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-03-11 12:00+0000\n"
"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -23,10 +23,7 @@ msgstr " "
# src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
# src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
# src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr " ["
@@ -80,8 +77,7 @@ msgstr " "
# src/kwset.c:190
# src/grep.c:164 src/grep.c:181 src/grep.c:283 src/grep.c:338 src/kwset.c:184
# src/kwset.c:190
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr " "
@@ -91,62 +87,62 @@ msgstr " "
msgid "invalid context length argument"
msgstr " "
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr " "
# src/grep.c:392 src/grep.c:1034
# src/grep.c:487 src/grep.c:1284
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr " "
# src/grep.c:715
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr " %s \n"
# src/grep.c:964 src/grep.c:1015
# src/grep.c:730
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "( )"
# src/grep.c:293
# src/grep.c:366
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr ": %s: %s\n"
# src/grep.c:844
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr " "
# src/grep.c:597
# src/grep.c:862
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s []... []...\n"
# src/grep.c:598
# src/grep.c:863
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " `%s --help' .\n"
# src/grep.c:602
# src/grep.c:867
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s []... [] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -159,7 +155,7 @@ msgstr ""
"\n"
" :\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -174,7 +170,7 @@ msgstr ""
# src/grep.c:603
# src/grep.c:868
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -195,7 +191,7 @@ msgstr ""
# src/grep.c:615
# src/grep.c:880
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -216,7 +212,7 @@ msgstr ""
# src/grep.c:622
# src/grep.c:887
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -282,7 +278,7 @@ msgstr ""
# src/grep.c:633
# src/grep.c:902
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -328,57 +324,56 @@ msgstr ""
# src/grep.c:647
# src/grep.c:917
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
" <bug-gnu-utils@gnu.org>.\n"
# src/grep.c:829
# src/grep.c:1112
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr " "
# src/grep.c:1133
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr " "
# src/grep.c:1133
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr " "
# src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
# src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr " "
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr " "
# src/grep.c:915
# src/grep.c:1219
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
# src/grep.c:917
# src/grep.c:1221
-#: src/grep.c:1662
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr " 1988, 1992-1999, 2000, 2001 \n"
# src/grep.c:919
# src/grep.c:1223
-#: src/grep.c:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/eo.po b/po/eo.po
index 53d7682c..f0564983 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,31 +1,32 @@
# La teksto por la mesaĝoj de la "grep" programo.
# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
# D. Dale Gulledge <dsplat@rochester.rr.com>, 1999.
-# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2000-2005.
+# Edmund GRIMLEY EVANS <edmundo@rano.org>, 2000-2007.
#
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-04 20:04+0000\n"
+"Project-Id-Version: GNU grep 2.5.3\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"
"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:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
msgstr "Memoro elĉerpita"
-#: 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: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
msgid "Unbalanced ["
msgstr "Senpara ["
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
msgstr "Nefinita \\-eskapo"
@@ -33,108 +34,119 @@ msgstr "Nefinita \\-eskapo"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
msgstr "nefinita ripetonombro"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
msgstr "misformita ripetonombro"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
msgstr "Senpara ("
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
msgstr "Mankas sintakso"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
msgstr "Senpara )"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "memoro elĉerpita"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
msgstr "memoro elĉerpita"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "nevalida argumento por kunteksto-longo"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
msgstr "enigo estas tro granda por nombrado"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
msgstr "skribas eligon"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binara dosiero %s kongruas\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(normala enigo)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "averto: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "rekursa dosieruja ciklo"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uzado: %s [OPCIO]... ŜABLONO [DOSIERO]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Provu `%s --help' por pliaj informoj.\n"
-#: src/grep.c:1053
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Serĉi pri ŜABLONO en ĉiu DOSIERO aŭ en la normala enigo.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "ŜABLONO estas etendita regula esprimo (ERE).\n"
+
+#: src/grep.c:1418
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Uzado: %s [OPCIO]... ŜABLONO [DOSIERO] ...\n"
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "ŜABLONO estas aro da fiksitaj signoĉenoj en apartaj linioj.\n"
-#: src/grep.c:1054
+#: src/grep.c:1421
+#, c-format
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "ŜABLONO estas, implicite, baza regula esprimo (BRE).\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 ""
-"Serĉi pri ŜABLONO en ĉiu DOSIERO aŭ la normala enigo.\n"
"Ekzemplo: %s -i 'saluton mondo' menu.h main.c\n"
"\n"
"Elekto kaj interpreto de regulaj esprimoj:\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 ŜABLONO estas etendita regula esprimo\n"
+" -E, --extended-regexp ŜABLONO estas etendita regula esprimo (ERE)\n"
" -F, --fixed-strings ŜABLONO estas aro da ĉenoj apartigitaj de linifinoj\n"
-" -G, --basic-regexp ŜABLONO estas simpla regula esprimo\n"
+" -G, --basic-regexp ŜABLONO estas baza regula esprimo (BRE)\n"
" -P, --perl-regexp ŜABLONO estas regula esprimo de 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"
@@ -148,7 +160,8 @@ msgstr ""
" -x, --line-regexp devigi al ŜABLONO kongrui nur al tutaj linioj\n"
" -z, --null-data datenlinio finiĝas per bitoko 0, ne per linifino\n"
-#: src/grep.c:1071
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,7 +179,8 @@ msgstr ""
" --help montri ĉi tiun helpon kaj fini\n"
" --mmap uzi memoromapon por la enigo, se eble\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -179,21 +193,23 @@ 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"
@@ -204,7 +220,8 @@ msgstr ""
" --line-buffered peli la eligon post ĉiu linio\n"
" -H, --with-filename presi la dosiernomon por ĉiu trafo\n"
" -h, --no-filename subpremi la prefiksan dosiernomon ĉe eligo\n"
-" --label=ETIKEDO presi ETIKEDOn kiel dosiernomon en normala eligo\n"
+" --label=ETIKEDO presi ETIKEDOn kiel dosiernomon de normala enigo\n"
+" -o, --only-matching montri nur la liniparton, kiu kongruas kun ŜABLONO\n"
" -q, --quiet, --silent subpremi ĉian normalan eligadon\n"
" --binary-files=SPECO supozi, ke binaraj dosieroj estas de SPECO\n"
" SPECO estas 'binary', 'text', aŭ 'without-match'\n"
@@ -215,15 +232,18 @@ msgstr ""
" -D, --devices=AGO kiel trakti specialajn dosierojn;\n"
" AGO estas 'read' (legi), aŭ 'skip' (ignori)\n"
" -R, -r, --recursive same kiel --directories=recurse.\n"
-" --include=ŜABLONO ekzameni dosierojn, kiuj kongruas kun ŜABLONO\n"
-" --exclude=ŜABLONO ignori dosierojn, kiuj kongruas kun ŜABLONO\n"
+" --include=ŜABLONO ekzameni nur dosierojn, kiuj kongruas kun ŜABLONO\n"
+" --exclude=ŜABLONO ignori dosier(uj)ojn, kiuj kongruas kun ŜABLONO\n"
" --exclude-from=DOS ignori dosierojn, kiuj kongruas kun ŝablono en DOS\n"
+" --exclude-dir=ŜABLONO ignori dosierujojn, kiuj kongruas kun ŜABLONO\n"
" -L, --files-without-match presi nur dosiernomojn sen trafo\n"
" -l, --files-with-matches presi nur dosiernomojn kun trafoj\n"
" -c, --count presi nur nombron de kongruaj linioj en ĉiu dosiero\n"
+" -T, --initial-tab rektigi la TAB-signojn (se necese)\n"
" -Z, --null presi la bitokon 0 post dosiernomo\n"
-#: src/grep.c:1107
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -232,87 +252,132 @@ 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"
"Regado de la kunteksto:\n"
" -B, --before-context=NOM presi NOM liniojn da antaŭa kunteksto\n"
" -A, --after-context=NOM presi NOM liniojn da posta kunteksto\n"
-" -C, --context=NOM presi NOM liniojn da kunteksto\n"
+" -C, --context=NOM presi NOM liniojn da eliga kunteksto\n"
" -NOM same kiel --context=NOM\n"
" --color[=KIAM],\n"
-" --colour[=KIAM] uzi markilojn por distingi la kongruan ĉenon;\n"
-" KIAM povas esti 'always' (ĉiam), 'never' (neniam),\n"
+" --colour[=KIAM] uzi markilojn por distingi la kongruajn ĉenojn;\n"
+" KIAM estas 'always' (ĉiam), 'never' (neniam),\n"
" aŭ 'auto' (aŭtomate)\n"
" -U, --binary ne forigi \\r-signojn ĉe linifino (MSDOS)\n"
" -u, --unix-byte-offsets doni bitoknumerojn, kvazaŭ \\r-signoj mankus (MSDOS)\n"
"\n"
-"'egrep' signifas 'grep -E'. 'fgrep' signifas 'grep -F'.\n"
-"Kiam DOSIERO mankas, aŭ DOSIERO estas -, legi la normalan enigon. Se malpli\n"
-"ol du DOSIEROj estas donitaj, supozi -h. Finvaloro estas 0, se estis trafo,\n"
-"1, se ne estis, kaj 2 ĉe eraro.\n"
-#: src/grep.c:1124
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Alvoko kiel 'egrep' estas malrekomendata; uzu 'grep -E' anstataŭe.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "Alvoko kiel 'fgrep' estas malrekomendata; uzu 'grep -F' anstataŭe.\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' signifas 'grep -E. 'fgrep' signifas 'grep -F'.\n"
+"Rekta alvoko kiel aŭ 'egrep' aŭ 'fgrep' estas malrekomendata.\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 ""
+"Kiam mankas DOSIERO, aŭ kiam DOSIERO estas -, legu la normalan enigon. Se\n"
+"malpli ol du DOSIEROJ estas donataj, supozu -h. Finvaloro estas 0, se iu\n"
+"linio estis elektita; alie 1; se eraro okazis, kaj -q ne estis specifita,\n"
+"la finvaloro estas 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"
-"Raportu cimojn al <bug-grep@gnu.org>.\n"
+"Raportu cimojn al <%s>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "malkongruaj kompariloj estas indikitaj"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "En GREP_COLORS=\"%s\", \"%s\" bezonas valoron (\"=...\"); ignorite."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "En GREP_COLORS=\"%s\", \"%s\" estas bulea kaj ne povas alpreni valoron (\"=%s\"); ignorite."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "En 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 "Ĉesis pritrakti malbone formitan GREP_COLORS=\"%s\" ĉe restanta subĉeno \"%s\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
msgstr "nekonata metodo por specialaj dosieroj"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
msgstr "nekonata dosieruja metodo"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
msgstr "nevalida maksimuma nombro"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
msgstr "nekonata speco de binara dosiero"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+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:1662
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Kopirajto 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-
-#: src/grep.c:1664
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"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"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "La opcio -P ne estas disponata"
-
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Funkcioj respondaj al la opcio -P ne estas inkluzivitaj en ĉi tiu programo tradukita kun --disable-perl-regexp"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
msgstr "Ne eblas kombini la opciojn -P kaj -z"
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "La opcio -P akceptas nur unuopan ŝablonon"
+
#: lib/error.c:117
msgid "Unknown system error"
msgstr "Nekonata sistemeraro"
diff --git a/po/es.po b/po/es.po
index a939a27e..9dab6ff4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-03-10 13:49+0100\n"
"Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -18,10 +18,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memoria agotada"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ desemparejado"
@@ -58,8 +55,7 @@ msgstr ") desemparejado"
msgid "out of memory"
msgstr "memoria agotada"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memoria agotada"
@@ -67,49 +63,49 @@ msgstr "memoria agotada"
msgid "invalid context length argument"
msgstr "longitud de contexto invlida"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "la entrada es demasiado grande para contar"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "escribiendo el resultado"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Coincidencia en el fichero binario %s\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entrada estndar)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "atencin: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "bucle de directorio recursivo"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Modo de empleo: %s [OPCIN]... PATRN [FICHERO]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para ms informacin.\n"
# FIXME: Dice [FILE] ... en vez de [FILE]... Ser un error?
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Modo de empleo: %s [OPCIN]... PATRN [FICHERO] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -122,7 +118,7 @@ msgstr ""
"\n"
"Seleccin e interpretacin de Expreg:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -135,7 +131,7 @@ msgstr ""
" -G, --basic-regexp PATRN es una expresin regular bsica\n"
" -P, --perl-regexp PATRN es una expresin regular en Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -154,7 +150,7 @@ msgstr ""
" -z, --null-data una lnea de datos termina en un byte 0, no\n"
" en un carcter de nueva lnea\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -172,7 +168,7 @@ msgstr ""
" --help muestra esta ayuda y finaliza\n"
" --mmap utiliza entrada asignada en memoria si es posible\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -240,7 +236,7 @@ msgstr ""
" por cada FICHERO\n"
" -Z, --null imprime un byte 0 despus del nombre del FICHERO\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -278,11 +274,10 @@ msgstr ""
"Si se dan menos de dos FICHEROs, se supone -h. La salida es 0 si hay\n"
"coincidencias, 1 si no las hay, y 2 en caso de problema\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Comunicar bichos a <bug-gnu-utils@gnu.org>.\n"
@@ -298,38 +293,38 @@ msgstr ""
#
# No me gusta nada lo de opcin "a buscar".
# Se admiten sugerencias. sv
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "se han especificado expresiones conflictivas"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "mtodo de dispositivos desconocido"
# Nota: Se refiere a la opcin --directories=ACCIN cuando ACCIN
# no es `read', `recurse' o `skip'.
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mtodo de directorios desconocido"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "contador mximo invlido"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo binary-files desconocido"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/fi.po b/po/fi.po
index 21fd4a40..43222e60 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,157 +1,170 @@
+# translation of grep.pot to Finnish
# Finnish translations for GNU grep.
-# Copyright 2002 Free Software Foundation, Inc.
-# Sami J. Laine <sami.laine@iki.fi>, 2002
+# Copyright © 2002, 2007 Free Software Foundation, Inc.
#
+# Sami J. Laine <sami.laine@iki.fi>, 2002.
+# Jorma Karvonen <karvjorm@users.sf.net>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: grep-2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2002-07-19 13:02+0200\n"
-"Last-Translator: Sami J. Laine <sami.laine@iki.fi>\n"
+"Project-Id-Version: grep 2.5.3\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"
+"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=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"\n"
+"X-Generator: KBabel 1.11.2\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
-msgstr "Muisti loppu"
+msgstr "Muisti loppui"
-#: 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: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
msgid "Unbalanced ["
-msgstr "Pariton \"[\""
+msgstr "Pariton ["
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
-msgstr "Pttymtn \\-ohjausmerkki"
+msgstr "Päättymätön \\-ohjausmerkki"
#. 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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
-msgstr "pttymtn toistomr"
+msgstr "päättymätön toistomäärä"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
-msgstr "virheellinen toistomr"
+msgstr "virheellinen toistomäärä"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
-msgstr "Pariton \"(\""
+msgstr "Pariton ("
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
-msgstr "Syntaksia ei mritelty"
+msgstr "Syntaksia ei ole määritelty"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
-msgstr "Pariton \")\""
-
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "muisti loppu"
+msgstr "Pariton )"
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
-msgstr "muisti loppu"
+msgstr "muisti loppui"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "virheellinen kontekstin pituusargumentti"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "sytt on liian suuri laskentaan"
+msgstr "syöte on liian suuri laskettavaksi"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
-msgstr "kirjoitetaan tulostetta"
+msgstr "kirjoitettaessa tulostetta"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Binrinen tiedosto %s tsm hakuun\n"
+msgstr "Binääritiedosto %s täsmää hakuun\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(vakiosytt)"
+msgstr "(vakiosyöte)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "varoitus: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "rekursiivinen hakemistosilmukka"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Kytt: %s [VALITSIN]... HAKUKAAVA [TIEDOSTO]...\n"
+msgstr "Käyttö: %s [VALITSIN]... HAKULAUSEKE [TIEDOSTO]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Yrit \"%s --help\" saadaksesi lisohjeita.\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:1053
+#: src/grep.c:1418
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Kytt: %s [VALITSIN]... HAKUKAAVA [TIEDOSTO] ...\n"
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "HAKULAUSEKE on rivinvaihdolla eroteltu kiinteä merkkijonojoukko.\n"
-#: src/grep.c:1054
+#: 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"
+
+#: 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 ""
-"Etsii HAKUKAAVAa jokaisesta TIEDOSTOsta tai vakiosytteest.\n"
"Esimerkki: %s -i 'hei maailma' menu.h main.c\n"
"\n"
-"Snnllisten lausekkeiden valinta ja tulkinta:\n"
+"Säännöllisten lausekkeiden valinta ja tulkinta:\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 HAKUKAAVA on laajennettu snnllinen lauseke\n"
-" (engl. extended regular expression)\n"
-" -F, --fixed-strings HAKUKAAVA on joukko rivinvaihdolla erotettuja\n"
-" merkkijonoja\n"
-" -G, --basic-regexp HAKUKAAVA on snnllinen lauseke\n"
-" (engl. basic regular expression)\n"
-" -P, --perl-regexp HAKUKAAVA on Perlin snnllinen lauseke\n"
-" (engl. Perl regular expression)\n"
-
-#: src/grep.c:1064
+" -E, --extended-regexp HAKULAUSEKE on laajennettu säännöllinen lauseke (ERE)\n"
+" -F, --fixed-strings HAKULAUSEKE on joukko rivinvaihdolla eroteltuja merkkijonoja\n"
+" -G, --basic-regexp HAKULAUSEKE on perus-säännöllinen lauseke (BRE)\n"
+" -P, --perl-regexp HAKULAUSEKE on Perl-tyyppinen säännöllinen lauseke\n"
+
+#: 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=HAKUKAAVA kyt HAKUKAAVAa snnllisen lausekkeena\n"
-" -f, --file=TIEDOSTO nouda HAKUKAAVA TIEDOSTOsta\n"
-" -i, --ignore-case l erottele pieni ja suuria merkkej\n"
-" -w, --word-regexp pakota HAKUKAAVAn tsmys vain kokonaisiin sanoihin\n"
-" -x, --line-regexp pakota HAKUKAAVAn tsmys vain kokonaisiin riveihin\n"
-" -z, --null-data datarivi pttyy 0-tavuun, ei rivinvaihtoon\n"
-
-#: src/grep.c:1071
+" -e, --regexp=HAKULAUSEKE käytä HAKULAUSEKEtta säännöllisenä lausekkeena\n"
+" -f, --file=TIEDOSTO nouda HAKULAUSEKE TIEDOSTOsta\n"
+" -i, --ignore-case älä erottele pieniä ja suuria kirjaimia\n"
+" -w, --word-regexp pakota HAKULAUSEKE täsmäämään vain kokonaisiin sanoihin\n"
+" -x, --line-regexp pakota HAKULAUSEKE täsmäämään vain kokonaisiin riveihin\n"
+" -z, --null-data datarivi päättyy nollatavuun, ei rivinvaihtoon\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -163,14 +176,15 @@ msgid ""
msgstr ""
"\n"
"Sekalaista:\n"
-" -s, --no-messages est virheilmoitusten tulostaminen\n"
-" -v, --invert-match valitse ei-tsmvt rivit\n"
+" -s, --no-messages vaienna virheilmoitukset\n"
+" -v, --invert-match valitse hakuun täsmäämättömät rivit\n"
" -V, --version tulosta versiotiedot ja lopeta suoritus\n"
-" --help tulosta tm ohje ja lopeta suoritus\n"
-" --mmap kyt muistiinkartoitettua sytett, jos\n"
+" --help tulosta tämä ohje ja lopeta suoritus\n"
+" --mmap käytä muistiinkartoitettua syötettä, jos\n"
" mahdollista\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -183,53 +197,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"
"Tulosteen hallinta:\n"
-" -m, --max-count=N lopeta kun N tsmyst on lytynyt\n"
+" -m, --max-count=N lopeta kun N täsmäystä on löytynyt\n"
" -b, --byte-offset tulosta tavuosoite tulosteriveille\n"
" -n, --line-number tulosta rivinumero tulosteriveille\n"
-" --line-buffered tyhjenn puskuri jokaisella tulosterivill\n"
-" -H, --with-filename tulosta tiedostonimi jokaiselle tsmykselle\n"
-" -h, --no-filename est tiedostonimen tulostaminen\n"
-" --label=LEIMA tulosta LEIMA tiedostonimen sijaan luettaessa\n"
-" vakiosyttett\n"
-" -o, --only-matching nyt vain HAKUKAAVAan tsmv osa rivist\n"
-" -q, --quiet, --silent est kaikki normaalit tulosteet\n"
-" --binary-files=TYYPPI oleta binristen tiedostojen olevan TYYPPI\n"
-" TYYPPI on 'binary', 'text', tai 'without-match'\n"
-" -a, --text sama kuin --binary-files=text\n"
+" --line-buffered tyhjennä puskuri jokaisella tulosterivillä\n"
+" -H, --with-filename tulosta tiedostonimi jokaiselle täsmäykselle\n"
+" -h, --no-filename vaienna tiedostonimen tulostaminen\n"
+" --label=OTSIKKO tulosta OTSIKKO tiedostonimenä luettaessa\n"
+" vakiosyöttettä\n"
+" -o, --only-matching näytä vain HAKULAUSEKE-täsmäävä osa rivistä\n"
+" -q, --quiet, --silent vaienna kaikki normaalit tulosteet\n"
+" --binary-files=TYYPPI oleta binääristen tiedostojen olevan TYYPPIä\n"
+" TYYPPI on ”binary” (binääri), ”text” (teksti), tai\n"
+" ”without-match” (täsmäämätön)\n"
+" -a, --text sama kuin --binary-files=”text” (teksti)\n"
" -I sama kuin --binary-files=without-match\n"
-" -d, --directories=TOIMI hakemistojen ksittelytapa\n"
-" TOIMI on 'read', 'recurse', tai 'skip'\n"
-" -D, --devices=TOIMI laitetiedostojen, FIFOjen ja sokettien ksittely\n"
-" TOIMI on 'read' tai 'skip'\n"
-" -R, -r, --recursive sama kuin --directories=recurse\n"
-" --include=HAKUKAAVA HAKUKAAVAan tsmvt tiedostot tutkitaan\n"
-" --exclude=HAKUKAAVA HAKUKAAVAan tsmvt tiedostot jtetn tutkimatta\n"
-" --exclude-from=TIED. HAKUKAAVAan tsmvt tiedostot, joiden nimet\n"
-" luetaan TIED.ostosta, jtetn tutkimatta\n"
-" -L, --files-without-match tulosta vain TIEDOSTOt, joista ei lyty tsmyst\n"
-" -l, --files-with-matches tulosta vain TIEDOSTOt, joista lytyy tsmys\n"
-" -c, --count tulosta vain tsmysten mr TIEDOSTOlle\n"
-
-#: src/grep.c:1107
+" -d, --directories=TOIMI hakemistojen käsittelytapa\n"
+" TOIMI on ”read” (lue), ”recurse” (itseensä palautuva),\n"
+" tai ”skip” (jätä väliin)\n"
+" -D, --devices=TOIMI laitetiedostojen, FIFOjen ja pistokkeiden käsittely\n"
+" TOIMI on ”read” (lue) tai ”skip” (jätä väliin)\n"
+" -R, -r, --recursive sama kuin --directories=recurse\n"
+" --include=TIEDOSTOKAAVA TIEDOSTOKAAVA-täsmäävät tiedostot tutkitaan\n"
+" --exclude=TIEDOSTOKAAVA TIEDOSTOKAAVA-täsmäävät tiedostot jätetään tutkimatta\n"
+" --exclude-from=TIEDOSTO TIEDOSTOKAAVA-täsmäävät tiedostot, joiden nimet\n"
+" luetaan TIEDOSTOsta, jätetään tutkimatta\n"
+" -L, --files-without-match tulosta vain TIEDOSTOt, joista ei löydy täsmäystä\n"
+" -l, --files-with-matches tulosta vain TIEDOSTOt, joista löytyy täsmäys\n"
+" -c, --count tulosta vain täsmäysten määrä TIEDOSTOlle\n"
+" -T, --initial-tab tee sarkaimet riveittäin (jos tarvitaan)\n"
+" -Z, --null tulosta nollatavu TIEDOSTO-nimen jälkeen\n"
+
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -238,128 +259,178 @@ 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"
-"Sislln hallinta:\n"
-" -B, --before-context=N tulosta N rivi ennen sislt\n"
-" -A, --after-context=N tulosta N rivi sislln jlkeen\n"
-" -C, --context=N tulosta N rivi tulostesislt\n"
+"Konteksin hallinta:\n"
+" -B, --before-context=N tulosta N riviä ennen konteksia\n"
+" -A, --after-context=N tulosta N riviä konteksin jälkeen\n"
+" -C, --context=N tulosta N riviä tulostekonteksia\n"
" -NUM sama kuin --context=N\n"
" --color[=KOSKA],\n"
-" --colour[=KOSKA] kyt markkereita tsmvn merkkijonon\n"
-" erottamiseen\n"
-" KOSKA voi olla `always', `never' tai `auto'.\n"
-" -U, --binary l poista CR-merkki rivin lopusta (MSDOS)\n"
-" -u, --unix-byte-offsets ilmoita siirtymt kuten CR-merkkej ei olisi\n"
-" lainkaan (MSDOS)\n"
+" --colour[=KOSKA] käytä merkkejä täsmäävän merkkijonon\n"
+" korostamiseen\n"
+" KOSKA voi olla ”always” (aina), ”never”\n"
+" (ei koskaan) tai ”auto” (automaattisesti).\n"
+" -U, --binary älä poista ”telan palatus”-merkkiä CR rivin\n"
+" lopusta (MSDOS)\n"
+" -u, --unix-byte-offsets ilmoita siirrokset aivan kuin ”telan palatus”\n"
+" -merkkiä CR ei olisi lainkaan (MSDOS)\n"
"\n"
-#: src/grep.c:1124
-#, fuzzy
+#: 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"
+msgstr ""
+"Käsky ”egrep” tarkoittaa ”grep -E”. Käsky ”fgrep” tarkoittaa ”grep -F”.\n"
+"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"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Jos TIEDOSTOa ei ole annettu tai kun TIEDOSTO on -, lue vakiosyötettä. Jos on annettu\n"
+"vähemmän kuin kaksi TIEDOSTOa, otaksu ”-h”-valitsin. Paluuarvo on nolla, jos yksikin\n"
+"rivi on valittu, muutoin yksi; jos tapahtuu virheitä ja ”-q”-valitsinta ei ollut\n"
+"annettu, niin paluuarvo on kaksi.\n"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Ilmoita virheist osoitteeseen <bug-gnu-utils@gnu.org>.\n"
+"Ilmoita ohjelmistovioista osoitteeseen <%s>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
-msgstr "mritelty ristiriitaiset haut"
+msgstr "määritelty ristiriitaiset haut"
+
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "Kohteessa GREP_COLORS=”%s”, ”%s”-kapasiteetti tarvitsee arvon (”=...”); jätettiin väliin."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "Kohteessa GREP_COLORS=”%s”, ”%s”-kapasiteetti on boolean-tyyppinen ja se ei voi saada arvoa (”=%s”); jätettiin väliin."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "Kohteessa GREP_COLORS=”%s”, ”%s”-kapasiteetti %s."
-#: src/grep.c:1376
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Pysäytettiin vääränmuotoisen kohteen GREP_COLORS=”%s”prosessointi jäljelle jäävässä osamerkkijonossa ”%s”."
+
+#: src/grep.c:1883
msgid "unknown devices method"
msgstr "tuntematon laitemetodi"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
msgstr "tuntematon hakemistometodi"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
-msgstr "virheellinen maksimimr"
+msgstr "virheellinen maksimimäärä"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
-msgstr "tuntematon binritiedoston tyyppi"
+msgstr "tuntematon binääritiedostojen tyyppi"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+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: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
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"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 ""
-"Tm ohjelma on vapaa ohjelmisto; tarkista jakeluehdot lhdekoodista.\n"
-"Tlle ohjelmalle ei anneta minknlaista takuuta; ei edes takuuta\n"
-"kaupallisesti hyvksyttvst laadusta tai soveltuvuudesta tiettyyn\n"
+"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"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Valitsin -P ei ole tuettu"
-
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Tuki valitsimelle ”-P” ei ole käännetty tähän ”--disable-perl-regexp”-binääriin"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "Valitsimia -P ja -z ei voi kytt samanaikaisesti"
+msgstr "Valitsimia ”-P” ja ”-z” ei voida käyttää samanaikaisesti"
+
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Valitsin ”-P” tukee vain yhtä HAKULAUSEKEtta"
#: lib/error.c:117
msgid "Unknown system error"
-msgstr "Tuntematon jrjestelmvirhe"
+msgstr "Tuntematon järjestelmävirhe"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valitsin \"%s\" on moniselitteinen\n"
+msgstr "%s: valitsin ”%s” on moniselitteinen\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin \"--%s\" ei salli argumenttia\n"
+msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valitsin \"%c%s\" ei salli argumenttia\n"
+msgstr "%s: valitsin ”%c%s” ei salli argumenttia\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valitsin \"%s\" tarvitsee argumentin\n"
+msgstr "%s: valitsin ”%s” tarvitsee argumentin\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: tuntematon valitsin \"--%s\"\n"
+msgstr "%s: tuntematon valitsin ”--%s”\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: tuntematon valitsin \"%c%s\"\n"
+msgstr "%s: tuntematon valitsin ”%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: epkelpo valitsin -- %c\n"
+msgstr "%s: epäkelpo valitsin -- %c\n"
#: lib/getopt.c:785
#, c-format
@@ -375,12 +446,12 @@ msgstr "%s: valitsin tarvitsee argumentin -- %c\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valitsin \"-W %s\" on moniselitteinen\n"
+msgstr "%s: valitsin ”-W %s” on moniselitteinen\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valitsin \"-W -%s\" ei salli argumenttia\n"
+msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n"
#. Get translations for open and closing quotation marks.
#.
@@ -398,8 +469,8 @@ msgstr "%s: valitsin \"-W -%s\" ei salli argumenttia\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr "\""
+msgstr "”"
#: lib/quotearg.c:260
msgid "'"
-msgstr "\""
+msgstr "”"
diff --git a/po/ga.po b/po/ga.po
index 7668db74..66ec0109 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,31 +1,31 @@
# Irish translations for grep.
# Copyright (C) 2003 Free Software Foundation, Inc.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2003.
-#
+# Kevin Patrick Scannell <scannell@SLU.EDU>, 2003, 2007.
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-02 15:48-0500\n"
-"Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"Project-Id-Version: grep 2.5.3\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"
+"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:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
msgstr "Cuimhne dithe"
-#: 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: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
msgid "Unbalanced ["
msgstr "[ corr"
# FARF - KPS
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
msgstr "Seicheamh alchin \\ gan chrochn"
@@ -33,125 +33,137 @@ msgstr "Seicheamh alchin \\ gan chrochn"
#. {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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
msgstr "T lon na hathrite neamhiomln"
# more precisely, "the string indicating the repeat count" is malformed -- KPS
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
msgstr "T lon na hathrite mchumtha"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
msgstr "( corr"
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
msgstr "Nor sonraodh aon chomhrir"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
msgstr ") corr"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "cuimhne dithe"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
msgstr "cuimhne dithe"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "T an argint a shonraonn an mid chomhthacs neamhbhail"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
msgstr "T an t-ionchur rmhr le hireamh"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
-msgstr "ag scrobh an aschuir"
+msgstr "aschur scrobh"
# using lit. "matching string" throughout for "match" - KPS
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
msgstr "Teaghrn comhoirinach sa chomhad dhnrtha %s\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(ionchur caighdenach)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "rabhadh: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "lb athchrsach i gcomhadlann"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "sid: %s [ROGHA]... PATRN [COMHAD]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fhil.\n"
-#: src/grep.c:1053
+#: 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"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "Is slonn ionadaochta feabhsaithe (ERE) PATRN.\n"
+
+#: src/grep.c:1418
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "sid: %s [ROGHA]... PATRN [COMHAD] ...\n"
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "Is tacar teaghrn PATRN, scartha le lnte nua.\n"
-#: src/grep.c:1054
+#: src/grep.c:1421
+#, c-format
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "Is slonn ionadaochta bunsach (BRE) PATRN, de rir ramhshocraithe.\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 ""
-"Dan cuardach ar PATRN i ngach COMHAD n n ionchur caighdenach.\n"
"Mar shampla: %s -i 'Dia duit' rogha.h promh.c\n"
"\n"
"Roghn agus lirmhni sloinn ionadaochta:\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 is slonn ionadaochta feabhsaithe PATRN\n"
-" -F, --fixed-strings is teaghrin scartha le lnte nua at i bPATRN\n"
-" -G, --basic-regexp is slonn ionadaochta bunsach PATRN\n"
-" -P, --perl-regexp is slonn ionadaochta Perl PATRN\n"
+" -E, --extended-regexp is slonn ionadaochta feabhsaithe (ERE) PATRN\n"
+" -F, --fixed-strings is tacar teaghrn PATRN, scartha le lnte nua\n"
+" -G, --basic-regexp is slonn ionadaochta bunsach (BRE) PATRN\n"
+" -P, --perl-regexp is slonn ionadaochta Perl PATRN\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=PATRN sid PATRN mar shlonn ionadaochta\n"
+" -e, --regexp=PATRN sid PATRN le haghaidh meaitsela\n"
" -f, --file=COMHAD faigh PATRN as COMHAD\n"
-" -i, --ignore-case dan neamhaird den chs litreacha\n"
-" -w, --word-regexp n glac mar chomhoirinach ach focail iomlna\n"
-" -x, --line-regexp n glac mar chomhoirinach ach lnte iomlna\n"
+" -i, --ignore-case dan neamhaird de chs na litreacha\n"
+" -w, --word-regexp meaitselann PATRN focail iomlna amhin\n"
+" -x, --line-regexp meaitselann PATRN lnte iomlna amhin\n"
" -z, --null-data lironn bearta '0' na foircinn lnte (vs. \\n)\n"
# cuimhnemhapilte is in FARF ! - KPS
-#: src/grep.c:1071
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -170,7 +182,8 @@ msgstr ""
" --mmap sid ionchur cuimhnemhapilte ms fidir\n"
# frithireamh, lne-uimhir in FARF - KPS
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -183,25 +196,27 @@ 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"
-"Rial aschuir:\n"
+"Rial aschurtha:\n"
" -m, --max-count=UIMHIR stop i ndiaidh UIMHIR lne comhoirinach\n"
" -b, --byte-offset taispein an frithireamh birt san aschur\n"
" -n, --line-number taispein lne-uimhreacha san aschur\n"
@@ -210,29 +225,32 @@ msgstr ""
" -h, --no-filename n taispein ainmneacha comhad\n"
" --label=LIPAD t LIPAD ainm comhaid don ionchur caighdenach\n"
" -o, --only-matching n taispein ach an teaghrn comhoirinach\n"
-" -q, --quiet, --silent mch an t-aschur gnch\n"
-" --binary-files=CINEL glac le comhaid dhnrtha mar CINEL\n"
+" -q, --quiet, --silent mch an gnth-aschur\n"
+" --binary-files=CINEL glac le comhaid dhnrtha mar CINEL;\n"
" CINEL = 'binary', 'text', n 'without-match'\n"
" -a, --text ar comhbhr le '--binary-files=text'\n"
-" -I ar comhbhr le '--binary-files=without-match\n"
-" -d, --directories=MODH modh oibre chun comhadlanna\n"
+" -I ar comhbhr le '--binary-files=without-match'\n"
+" -d, --directories=MODH modh oibre le haghaidh comhadlanna\n"
" MODH = 'read', 'recurse', n 'skip'\n"
-" -D, --devices=MODH modh oibre chun glasanna, FIFOnna, agus soicid\n"
-" MODH = 'read' n 'skip'\n"
+" -D, --devices=MODH modh oibre le haghaidh glasanna, FIFOnna,\n"
+" agus soicid; MODH = 'read' n 'skip'\n"
" -R, -r, --recursive ar comhbhr le '--directories=recurse'\n"
-" --include=PATRN dan scrd ar chomhaid chomhoirinacha\n"
-" --exclude=PATRN n dan scrd ar chomhaid chomhoirinacha\n"
-" --exclude-from=COMHAD n dan scrd ar chomhaid at comhoirinach leis\n"
-" an phatrn i gCOMHAD\n"
+" --include=PATRN dan cuardach i gcomhaid chomhoirinacha amhin\n"
+" --exclude=PATRN n dan cuardach i gcomhaid chomhoirinacha\n"
+" --exclude-from=COMHAD n dan cuardach i gcomhaid at comhoirinach le\n"
+" haon phatrn i gCOMHAD\n"
+" --exclude-dir=PATRN n dan cuardach i gcomhadlanna comhoirinacha.\n"
" -L, --files-without-match n taispein ach ainmneacha comhaid GAN\n"
-" teaghrn comhoirinach\n"
+" teaghrn comhoirinach\n"
" -l, --files-with-matches n taispein ach ainmneacha comhaid LE\n"
-" teaghrn comhoirinach\n"
+" teaghrn comhoirinach\n"
" -c, --count n taispein ach lon na teaghrin chomhoirinacha\n"
-" at i ngach comhad\n"
+" at i ngach comhad\n"
+" -T, --initial-tab Ailnigh na tib (ms g)\n"
" -Z, --null priontil beart '0' i ndiaidh an ainm comhaid\n"
-#: src/grep.c:1107
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -241,90 +259,135 @@ 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"
"Rial comhthacs:\n"
" -B, --before-context=UIMH taispein UIMH lne de chomhthacs tosaigh\n"
-" -A, --after-context=UIMH taispein UIMH lne de chomhthacs dheiridh\n"
+" -A, --after-context=UIMH taispein UIMH lne de chomhthacs deiridh\n"
" -C, --context=UIMHIR taispein UIMHIR lne de chomhthacs\n"
-" -UIMHIR ar comhbhr le '--context=UIMHIR\n"
+" -UIMHIR ar comhbhr le '--context=UIMHIR'\n"
" --color[=CATHAIN],\n"
" --colour[=CATHAIN] aibhsigh na teaghrin chomhoirinacha\n"
" CATHAIN = `always', `never' n `auto'.\n"
-" -U, --binary n scrios carachtair CR ag EOL (MSDOS)\n"
-" -u, --unix-byte-offsets dan neamhaird de CR le haghaidh frithireamh\n"
+" -U, --binary n scrios carachtair CR ag croch lne (DOS)\n"
+" -u, --unix-byte-offsets n bac le CRanna agus frithirimh romh (DOS)\n"
"\n"
+
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "T an t-ord `egrep' imithe i lig; sid `grep -E' ina ionad.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "T an t-ord `fgrep' imithe i lig; sid `grep -F' ina ionad.\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', agus `fgrep' = `grep -F'.\n"
+"T na horduithe `egrep' agus `fgrep' imithe i lig.\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 ""
"Mura bhfuil COMHAD ann, n ms '-' , ligh n ionchur caighdenach.\n"
"M t nos l n dh chomhad ann, d'sidf '-h'.\n"
-"Stdas scortha 0 (fuair PATRN it igin), 1 (n bhfuair ), n 2 (trioblid).\n"
+"Stdas scortha: 0 (roghnaodh aon lne ar a laghad), 1 (nor roghnaodh),\n"
+"n 2 (trioblid de shaghas igin agus nor tugadh -q).\n"
-#: src/grep.c:1124
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Seol tuairisc fabhtanna chuig <bug-grep@gnu.org>.\n"
+"Seol tuairisc fabhtanna chuig <%s>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "sonraodh patrin chontrrtha"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "I GREP_COLORS=\"%s\", t luach (\"=...\") de dhth i ndiaidh rimse \"%s\"; scipeladh ."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "I GREP_COLORS=\"%s\", t rimse \"%s\" den chinel boole agus n cheadatear luach (\"=%s\") ina dhiaidh; scipeladh ."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "I GREP_COLORS=\"%s\", rimse \"%s\": %s."
+
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Scoireadh phriseil teaghrn mchumtha GREP_COLORS=\"%s\" ag an bhfotheaghrn at fgtha: \"%s\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
-msgstr "modh anaithnid don ghlasanna"
+msgstr "modh anaithnid glasanna"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
-msgstr "modh anaithnid do na comhadlanna"
+msgstr "modh anaithnid comhadlann"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
msgstr "uasmhid neamhbhail"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
msgstr "cinel anaithnid de chomhad dnrtha"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+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: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
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"Is saorbhogearra an romhchlr seo; fach ar an bhunchd le haghaidh\n"
+"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 DO FHEIDHM AR LEITH.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Nl an rogha '-P' ar fil"
+"d'INDOLTACHT n FEILINACHT D'FHEIDHM AR LEITH.\n"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Tiomsaodh an clr dnrtha seo le --disable-perl-regexp agus gan tacaocht do rogha -P"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
msgstr "T na roghanna -P agus -z neamh-chomhoirinach le chile"
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "N thacaonn rogha -P ach le patrn aonair"
+
#: lib/error.c:117
msgid "Unknown system error"
-msgstr "Earrid chrais anaithnid"
+msgstr "Earrid anaithnid chrais"
#: lib/getopt.c:675
#, c-format
@@ -344,7 +407,7 @@ msgstr "%s: n cheadatear argint i ndiaidh na rogha `%c%s'\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: n folir argint don rogha `%s'\n"
+msgstr "%s: t argint de dhth i ndiaidh na rogha `%s'\n"
#. --option
#: lib/getopt.c:752
@@ -373,7 +436,7 @@ msgstr "%s: rogha neamhbhail -- %c\n"
#: lib/getopt.c:815 lib/getopt.c:945
#, c-format
msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: n folir argint don rogha -- %c\n"
+msgstr "%s: t argint de dhth i ndiaidh na rogha -- %c\n"
#: lib/getopt.c:862
#, c-format
@@ -406,3 +469,12 @@ msgstr "`"
#: lib/quotearg.c:260
msgid "'"
msgstr "'"
+
+#~ msgid "out of memory"
+#~ msgstr "cuimhne dithe"
+
+#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+#~ msgstr "sid: %s [ROGHA]... PATRN [COMHAD] ...\n"
+
+#~ msgid "%s (GNU grep) %s\n"
+#~ msgstr "%s (GNU grep) %s\n"
diff --git a/po/gl.po b/po/gl.po
index 61077d86..8ca37bf6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-03-12 15:58+0100\n"
"Last-Translator: Jacobo Tarro Barreiro <jtarrio@iname.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memoria esgotada"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ sen emparellar"
@@ -56,8 +53,7 @@ msgstr ") sen emparellar"
msgid "out of memory"
msgstr "memoria esgotada"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memoria esgotada"
@@ -65,48 +61,48 @@ msgstr "memoria esgotada"
msgid "invalid context length argument"
msgstr "argumento de lonxitude do contexto non vlido"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "a entrada longa de mis para contala"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "escribindo na sada"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Arquivo binario %s aparicins\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entrada estndar)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "aviso: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "ciclo de directorios recursivo"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Emprego: %s [OPCIN]... PATRN [FICHEIRO]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Escriba `%s --help' para mis informacin.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Emprego: %s [OPCIN]... PATRN [FICHEIRO] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Seleccin e interpretacin de expresins regulares:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp o PATRN unha expresin regular bsica\n"
" -P, --perl-regexp o PATRN unha expresin regular de Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,7 +143,7 @@ msgstr ""
" -x, --line-regexp obliga PATRON a encaixar con lias completas\n"
" -z, --null-data as lias de datos rematan nun bit 0\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,7 +161,7 @@ msgstr ""
" --help amosa esta axuda e sae\n"
" --mmap emprega entrada mapeada en memoria se se pode\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -226,7 +222,7 @@ msgstr ""
" -c, --count s amosa o nm. de lias coincidentes por FICHEIRO\n"
" -Z, --null producir un byte 0 tralo nome do FICHEIRO\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -264,46 +260,45 @@ msgstr ""
"estndar. Se se dan menos de dous FICHEIROs, suponse -h. O estado de sada \n"
"0 se hai aparicins, 1 se non hai, e 2 se o que hai son problemas.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Informe dos erros no programa a <bug-gnu-utils@gnu.org>.\n"
"Informe dos erros na traduccin a <proxecto@trasno.net>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "especificronse patrns conflictivos"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "mtodo de dispositivos descoecido"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mtodo de directorios descoecido"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "valor mximo non vlido"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo de ficheiros binarios descoecido"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/hr.po b/po/hr.po
index 9649b64e..78690b29 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-04-22 01:30+02:00\n"
"Last-Translator: Hrvoje Niksic <hniksic@xemacs.org>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memorija iscrpljena"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "Nesparena ["
@@ -56,8 +53,7 @@ msgstr "Nesparena )"
msgid "out of memory"
msgstr "ponestalo memorije"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memorija iscrpljena"
@@ -65,48 +61,48 @@ msgstr "memorija iscrpljena"
msgid "invalid context length argument"
msgstr "neispravan argument duljine konteksta"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "input je prevelik za brojanje"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "piem izlaz"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarni spis %s se podudara\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standardni ulaz)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "upozorenje: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "petlja u rekurziji direktorijima"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uporaba: %s [OPCIJA]... UZORAK [SPIS]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Za vie informacija pokrenite `%s --help'.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Koritenje: %s [OPCIJA]... UZORAK [SPIS] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Izbor i interpretacija regularnih izraza:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp UZORAK je osnovni regularni izraz\n"
" -P, --perl-regexp UZORAK je Perlov regularni izraz\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,7 +143,7 @@ msgstr ""
" -x, --line-regexp UZORAK moe odgovarati samo potpunim redovima\n"
" -z, --null-data red podataka zavrava s bajtom 0, ne s novim redom\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,7 +161,7 @@ msgstr ""
" --help prikai ovu pomo i izai\n"
" --mmap mapiraj ulazne podatke u memoriju ako je mogue\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -224,7 +220,7 @@ msgstr ""
" -c, --count ispii samo broj podudarnih linija po SPISU\n"
" -Z, --null ispii 0-bajt nakon naziva SPISA\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -261,45 +257,44 @@ msgstr ""
"Ako su zadana manje od dva SPISA, pretpostavi -h. Zavri sa statusom 0 ako\n"
"ima podudaranja, s 1 ako nema, a s 2 ako je bilo problema.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Bugove prijavljujte na <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "suprotstavljeni izrazi naznaeni"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "nepoznata metoda za deviceove"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "nepoznata metoda za direktorije"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "neispravan maksimalni broj ponavljanja"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "nepoznata vrsta binarnih spisa"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/hu.po b/po/hu.po
index ed6ba1cf..35aff5f4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-05-06 09:29+0200\n"
"Last-Translator: Emese Kovcs <emese@gnome.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -17,10 +17,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Elfogyott a memria"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "Pr nlkli ["
@@ -56,8 +53,7 @@ msgstr "Pr nlkli )"
msgid "out of memory"
msgstr "elfogyott a memria"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "elfogyott a memria"
@@ -65,48 +61,48 @@ msgstr "elfogyott a memria"
msgid "invalid context length argument"
msgstr "rvnytelen szvegkrnyezethossz argumentum"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "a bemenet tl nagy a megszmllshoz"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "eredmny kirsa"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "%s binris fjl illeszkedik\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(szabvnyos bemenet)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "vigyzat: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "rekurzv knyvtrhurok"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Hasznlat: %s [KAPCSOL]... MINTA [FJL]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prbld a `%s --help'-et.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Hasznlat: %s [KAPCSOL]... MINTA [FJL]...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +115,7 @@ msgstr ""
"\n"
"Regulris kifejezs kivlasztsa s rtelmezse:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +127,7 @@ msgstr ""
" -G, --basic-regexp MINTA alapvet regulris kifejezs (basic regexp)\n"
" -P, --perl-regexp MINTA Perl regulris kifejezs\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,7 +143,7 @@ msgstr ""
" -x, --line-regexp MINTA csak egsz sorra illeszkedik\n"
" -z, --null-data az adat sorai 0 bjtra vgzdnek, nem jsorra\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,7 +161,7 @@ msgstr ""
" --help emlkeztett r ki\n"
" --mmap memory-mapped bemenet hasznlata, ha lehetsges\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -227,7 +223,7 @@ msgstr ""
" -c, --count csak az illeszked sorok szmt rja, fjlonknt\n"
" -Z, --null 0 bjt rsa a fjlnv utn\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -263,46 +259,45 @@ msgstr ""
"kt FJL van megadva, -h kapcsolt felttelez. Kilpsi rtk 0, ha van \n"
"tallat, 1, ha nincs s 2, ha gond van.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"A hibkat jelentsd a <bug-gnu-utils@gnu.org> cmen.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
#, fuzzy
msgid "conflicting matchers specified"
msgstr "conflicting matchers specified"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "ismeretlen eszkzmdszer"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "ismeretlen knyvtrmdszer"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "rvnytelen maximlis szm"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "ismeretlen binris fjl tpus"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/id.po b/po/id.po
index 51d13c5e..a418e2f9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g.id.po\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\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"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -18,10 +18,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memori habis"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ tidak seimbang"
@@ -57,8 +54,7 @@ msgstr ") tidak seimbang"
msgid "out of memory"
msgstr "memori habis"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memori habis"
@@ -66,48 +62,48 @@ msgstr "memori habis"
msgid "invalid context length argument"
msgstr "argumen panjang konteks tidak valid"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "input terlalu besar untuk dihitung"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "menulis output"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "File biner %s cocok\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(input standar)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "peringatan: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "perulangan direktori rekursif"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Pemakaian: %s [OPSI]... POLA [FILE]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Pemakaian: %s [OPSI]... POLA [FILE] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +116,7 @@ msgstr ""
"\n"
"Seleksi dan interpretasi regexp:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,7 +128,7 @@ msgstr ""
" -G, --basic-regexp POLA adalah ekspresi reguler dasar\n"
" -P, --perl-regexp POLA adalah sebuah ekspresi reguler Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -149,7 +145,7 @@ msgstr ""
" -z, --null-data baris data berakhir dalam 0 byte, bukan newline\n"
"\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -167,7 +163,7 @@ msgstr ""
" --help tampilkan bantuan ini dan keluar\n"
" --mmap gunakan input memory-mapped bila memungkinkan\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -224,7 +220,7 @@ msgstr ""
" -c, --count hanya mencetak jumlah baris yang cocok per FILE\n"
" -Z, --null mencetak byte 0 setelah nama FILE\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -260,45 +256,44 @@ msgstr ""
"kurang dari dua file, asumsikan -h. Keluar dengan 0 jika cocok, dengan 1 jika\n"
"tidak. 2 jika terjadi masalah.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Laporkan kesalahan ke <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "dispesifikasikan matcher yang konflik"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "metode device tidak dikenal"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "metode direktori tidak dikenal"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "jumlah max tidak valid"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipe file biner tidak dikenal"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ja.po b/po/ja.po
index 0369d758..ccd393ac 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2002-04-06 11:34+09:00\n"
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -24,10 +24,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "꡼­ޤ"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ 礤ޤ"
@@ -63,8 +60,7 @@ msgstr ") 礤ޤ"
msgid "out of memory"
msgstr "꡼ʤʤޤ"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "꡼­ޤ"
@@ -72,48 +68,48 @@ msgstr "꡼­ޤ"
msgid "invalid context length argument"
msgstr "Կλְ꤬äƤޤ"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "Ϥ礭ƿޤ"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "Ϥν"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Хʥ꡼ե%sϰפޤ\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(ɸ)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "ٹ: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "ǥ쥯ȥ꡼ƵŪ롼פ򤷤Ƥޤ"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "ˡ: %s [ץ]š ʸѥ [ե]š\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ܤ`%s --help'¹ԤƤ\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "ˡ: %s [ץ]š ѥ [ե] š\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -126,7 +122,7 @@ msgstr ""
"\n"
"ɽȲˡ:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -138,7 +134,7 @@ msgstr ""
" -G, --basic-regexp ֥ѥפŪɽȤ\n"
" -P, --perl-regexp ֥ѥפPerlɽȤ\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -154,7 +150,7 @@ msgstr ""
" -x, --line-regexp ֥ѥװפ(ñ)ǹԤʤ\n"
" -z, --null-data ϤԤǤʤ̥ͤΥХȤǶڤ\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -172,7 +168,7 @@ msgstr ""
" --help ȤɸϤɽ\n"
" --mmap ⤷ǽʤ顢Ϥ꡼ޥåפ\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -232,7 +228,7 @@ msgstr ""
" -c, --count ե뤴Ȥ˰פԿΤߤɽ\n"
" -Z, --null ե̾θˡ̥ͤΥХȤɽ\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -269,45 +265,44 @@ msgstr ""
"ɸϤɤ߹ߤޤ֥եפθĿ1ʲξ硢-hȲꤷޤ\n"
"⤷פ0ǡʤ1ǡ㳲2ǡλޤ\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Х <bug-gnu-utils@gnu.org> 𤷤Ƥ\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "ꤷȹҤͤƤޤ"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "̤ΤΥǥХǤ"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "̤ΤΥǥ쥯ȥ꡼Ǥ"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "ײְäƤޤ"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "̤ΤΥХʥ꡼եηǤ"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ko.po b/po/ko.po
index d3511a30..98cbfc22 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.0f\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 1999-02-03 13:09-0500\n"
"PO-Revision-Date: 1997-09-03 11:19+0900\n"
"Last-Translator: Bang Jun-Young <bangjy@geocities.com>\n"
"Language-Team: Korean <ko@li.org>\n"
@@ -13,228 +13,288 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-KR\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:858
msgid "Memory exhausted"
msgstr "޸𸮰 ٴڳ"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "¦ ʴ ["
-
-#: src/dfa.c:741
+#: src/dfa.c:452
msgid "Unfinished \\ escape"
msgstr "ϰ \\ ̽"
#. Cases:
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
+#. {,M} - 0 through M
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
msgid "unfinished repeat count"
msgstr "ϰ ݺ ȸ"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
msgid "malformed repeat count"
msgstr "߸ ־ ݺ ȸ"
-#: src/dfa.c:1253
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
+msgid "Unbalanced ["
+msgstr "¦ ʴ ["
+
+#: src/dfa.c:849
msgid "Unbalanced ("
msgstr "¦ ʴ ("
-#: src/dfa.c:1378
+#: src/dfa.c:970
msgid "No syntax specified"
msgstr " ʾ"
-#: src/dfa.c:1386
+#: src/dfa.c:978
msgid "Unbalanced )"
msgstr "¦ ʴ )"
-#: src/dfa.c:2956
+#: src/dfa.c:1998
msgid "out of memory"
msgstr "޸ "
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/getopt.c:628
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' ȣ ɼԴϴ\n"
+
+#: src/getopt.c:652
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' ɼ μ ʽϴ\n"
+
+#: src/getopt.c:657
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' ɼ μ ʽϴ\n"
+
+#: src/getopt.c:674 src/getopt.c:847
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' ɼ μ ʿմϴ\n"
+
+#. --option
+#: src/getopt.c:703
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ν ɼ `--%s'\n"
+
+#. +option or -option
+#: src/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ν ɼ `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:733
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ߸ ɼ -- %c\n"
+
+#: src/getopt.c:736
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ɼ -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: src/getopt.c:766 src/getopt.c:896
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ɼ μ ʿմϴ -- %c\n"
+
+#: src/getopt.c:813
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' ȣ ɼԴϴ\n"
+
+#: src/getopt.c:831
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' ɼ μ ʽϴ\n"
+
+#: src/getopt1.c:132
+#, c-format
+msgid "option %s"
+msgstr "%s ɼ"
+
+#: src/getopt1.c:134
+#, c-format
+msgid " with arg %s"
+msgstr " %s μ "
+
+#: src/getopt1.c:149
+msgid "digits occur in two different argv-elements.\n"
+msgstr "ڰ ٸ argv ҿ ߰ߵǾϴ.\n"
+
+#: src/getopt1.c:151
+#, c-format
+msgid "option %c\n"
+msgstr "%c ɼ\n"
+
+#: src/getopt1.c:155
+msgid "option a\n"
+msgstr "a ɼ\n"
+
+#: src/getopt1.c:159
+msgid "option b\n"
+msgstr "b ɼ\n"
+
+#: src/getopt1.c:163
+#, c-format
+msgid "option c with value `%s'\n"
+msgstr "`%s' c ɼ\n"
+
+#: src/getopt1.c:167
+#, c-format
+msgid "option d with value `%s'\n"
+msgstr "`%s' d ɼ\n"
+
+#: src/getopt1.c:174
+#, c-format
+msgid "?? getopt returned character code 0%o ??\n"
+msgstr "?? getopt ڵ 0%o ־ϴ ??\n"
+
+#: src/getopt1.c:180
+msgid "non-option ARGV-elements: "
+msgstr "ɼ ARGV : "
+
+#: src/grep.c:169 src/grep.c:186 src/grep.c:288 src/grep.c:344 src/kwset.c:184
+#: src/kwset.c:190
msgid "memory exhausted"
msgstr "޸𸮰 ٴڳ"
-#: src/grep.c:205
-msgid "invalid context length argument"
-msgstr ""
-
-#: src/grep.c:479
-msgid "input is too large to count"
-msgstr ""
+#: src/grep.c:372 src/grep.c:843
+#, c-format
+msgid "%s: warning: %s: %s\n"
+msgstr "%s: : %s: %s\n"
-#: src/grep.c:605
+#: src/grep.c:497 src/grep.c:1318
msgid "writing output"
msgstr " ϰ ֽϴ"
-#: src/grep.c:878
+#: src/grep.c:726
#, c-format
msgid "Binary file %s matches\n"
msgstr ""
-#: src/grep.c:892
+#: src/grep.c:742
msgid "(standard input)"
msgstr "(ǥ Է)"
-#: src/grep.c:997
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
-msgstr "%s: : %s: %s\n"
-
-#: src/grep.c:998
+#: src/grep.c:844
msgid "recursive directory loop"
msgstr ""
-#: src/grep.c:1046
+#: src/grep.c:895
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s [ɼ]... []...\n"
-#: src/grep.c:1048
+#: src/grep.c:896
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " `%s --help' Ͻʽÿ.\n"
-#: src/grep.c:1053
+#: src/grep.c:900
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s [ɼ]... [] ...\n"
-#: src/grep.c:1054
-#, c-format
+#: src/grep.c:901
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
-"Example: %s -i 'hello world' menu.h main.c\n"
"\n"
"Regexp selection and interpretation:\n"
-msgstr ""
-
-#: src/grep.c:1059
-msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
+" -F, --fixed-regexp PATTERN is a fixed string separated by newlines\n"
" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
-msgstr ""
-
-#: src/grep.c:1064
-msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
" -i, --ignore-case ignore case distinctions\n"
" -w, --word-regexp force PATTERN to match only whole words\n"
" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr ""
-#: src/grep.c:1071
+#: src/grep.c:913
msgid ""
"\n"
"Miscellaneous:\n"
" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
+" -v, --revert-match select non-matching lines\n"
" -V, --version print version information and exit\n"
" --help display this help and exit\n"
-" --mmap use memory-mapped input if possible\n"
msgstr ""
-#: src/grep.c:1079
+#: src/grep.c:920
msgid ""
"\n"
"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
" -b, --byte-offset print the byte offset with output lines\n"
" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
" -H, --with-filename print the filename for each match\n"
" -h, --no-filename suppress the prefixing filename on output\n"
-" --label=LABEL print LABEL as filename for standard input\n"
-" -o, --only-matching show only the part of a line matching PATTERN\n"
" -q, --quiet, --silent suppress all normal output\n"
-" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
-" -a, --text equivalent to --binary-files=text\n"
-" -I equivalent to --binary-files=without-match\n"
+" -a, --text do not suppress binary output\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"
+" ACTION is 'read', 'recurse', or 'skip'.\n"
+" -r, --recursive equivalent to --directories=recurse.\n"
" -L, --files-without-match only print FILE names containing no match\n"
" -l, --files-with-matches only print FILE names containing matches\n"
" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
msgstr ""
-#: src/grep.c:1107
+#: src/grep.c:935
msgid ""
"\n"
"Context control:\n"
" -B, --before-context=NUM print NUM lines of leading context\n"
" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
+" -C, --context[=NUM] print NUM (default 2) lines of output context\n"
+" unless overriden by -A or -B\n"
" -NUM same as --context=NUM\n"
-" --color[=WHEN],\n"
-" --colour[=WHEN] use markers to distinguish the matching string\n"
-" WHEN may be `always', `never' or `auto'.\n"
" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
-"and 2 if trouble.\n"
+"If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n"
+"With no FILE, or when FILE is -, read standard input. If less than\n"
+"two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n"
+"Exit with 2 if syntax errors or system errors.\n"
msgstr ""
-#: src/grep.c:1124
+#: src/grep.c:950
#, fuzzy
-msgid ""
-"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+msgid "\nReport bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr " <bug0gnu-utils@prep.ai.mit.edu> ֽʽÿ.\n"
-#: src/grep.c:1134
-#, fuzzy
-msgid "conflicting matchers specified"
-msgstr "¦ ̹ Ǿ"
-
-#: src/grep.c:1376
-msgid "unknown devices method"
+#: src/grep.c:1093 src/grep.c:1100 src/grep.c:1109
+msgid "invalid context length argument"
msgstr ""
-#: src/grep.c:1443
-msgid "unknown directories method"
-msgstr ""
+#: src/grep.c:1116 src/grep.c:1121 src/grep.c:1126
+msgid "you may specify only one of -E, -F, or -G"
+msgstr "-E, -F, -G ߿ ϳ ֽϴ"
-#: src/grep.c:1510
-#, fuzzy
-msgid "invalid max count"
-msgstr "ϰ ݺ ȸ"
+#: src/grep.c:1145
+msgid "matcher already specified"
+msgstr "¦ ̹ Ǿ"
-#: src/grep.c:1565
-msgid "unknown binary-files type"
+#: src/grep.c:1166
+msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1660
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
+#: src/grep.c:1252
+#, c-format
+msgid "grep (GNU grep) %s\n"
msgstr "grep (GNU grep) %s\n"
-#: src/grep.c:1662
+#: src/grep.c:1254
#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
+msgid "Copyright (C) 1988, 1992-1997, 1998 Free Software Foundation, Inc.\n"
msgstr "۱ (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
-#: src/grep.c:1664
+#: src/grep.c:1256
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -242,134 +302,9 @@ msgstr ""
" α׷ ƮԴϴ. 翡 ҽ Ͻʽÿ.\n"
"ǰ̳ Ư ռ Ͽ,  ʽϴ.\n"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s' ȣ ɼԴϴ\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' ɼ μ ʽϴ\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' ɼ μ ʽϴ\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: `%s' ɼ μ ʿմϴ\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ν ɼ `--%s'\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ν ɼ `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ߸ ɼ -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ɼ -- %c\n"
-
-#. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ɼ μ ʿմϴ -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' ȣ ɼԴϴ\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' ɼ μ ʽϴ\n"
-
-#. Get translations for open and closing quotation marks.
-#.
-#. The message catalog should translate "`" to a left
-#. quotation mark suitable for the locale, and similarly for
-#. "'". If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
-#.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK). A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "%s ɼ"
-
-#~ msgid " with arg %s"
-#~ msgstr " %s μ "
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "ڰ ٸ argv ҿ ߰ߵǾϴ.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "%c ɼ\n"
-
-#~ msgid "option a\n"
-#~ msgstr "a ɼ\n"
-
-#~ msgid "option b\n"
-#~ msgstr "b ɼ\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "`%s' c ɼ\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "`%s' d ɼ\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt ڵ 0%o ־ϴ ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "ɼ ARGV : "
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "-E, -F, -G ߿ ϳ ֽϴ"
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "޸𸮰 ٴڳ\n"
+#: src/obstack.c:467
+msgid "memory exhausted\n"
+msgstr "޸𸮰 ٴڳ\n"
#~ msgid "Regexp selection and interpretation:\n"
#~ msgstr "Խ ð ؼ:\n"
diff --git a/po/ky.po b/po/ky.po
new file mode 100644
index 00000000..1bd675ca
--- /dev/null
+++ b/po/ky.po
@@ -0,0 +1,475 @@
+# Translation of grep-2.5.3 messages to Kirghiz/Kyrgyz
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GREP package.
+# Azilet Beishenaliev <aziletb@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grep 2.5.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-03 22:01+0200\n"
+"PO-Revision-Date: 2007-09-01 17:27+0100\n"
+"Last-Translator: Azilet Beishenaliev <aziletb@gmail.com>\n"
+"Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Kyrgyz\n"
+"X-Poedit-Country: KYRGYZSTAN\n"
+
+# Памятты эмне дейбиз яя? ;)
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
+msgid "Memory exhausted"
+msgstr "Память жетпей калды"
+
+#: 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
+msgid "Unbalanced ["
+msgstr "[ - мунун уйкашы жок"
+
+# escape - кыргызча???
+#: src/dfa.c:788
+msgid "Unfinished \\ escape"
+msgstr "Бүтпөй калган эскейп \\"
+
+#. 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
+msgid "unfinished repeat count"
+msgstr "кайталоо саны толук эмес жазылды"
+
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
+msgid "malformed repeat count"
+msgstr "кайталоо саны туура эмес жазылды"
+
+#: src/dfa.c:1305
+msgid "Unbalanced ("
+msgstr "( - мунун уйкашы жок"
+
+# кайсы синтаксис? грептин шаблонубу?
+#: src/dfa.c:1430
+msgid "No syntax specified"
+msgstr "Синтаксис аталган жок"
+
+#: src/dfa.c:1438
+msgid "Unbalanced )"
+msgstr ") - мунун уйкашы жок"
+
+# Памятты эмне дейбиз яя? ;)
+#: 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
+msgid "memory exhausted"
+msgstr "память жетпей калды"
+
+#: src/grep.c:404
+msgid "invalid context length argument"
+msgstr "контекст узундугу жарабайт"
+
+#: src/grep.c:665
+msgid "input is too large to count"
+msgstr "берилген данныйлардын саны саналбай турганча көп"
+
+#: src/grep.c:927
+msgid "writing output"
+msgstr "жооп жазыбатат"
+
+#: src/grep.c:1209
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr "Экилик форматтагы %s файлы уйкашат\n"
+
+#: src/grep.c:1223
+msgid "(standard input)"
+msgstr "(стандарт кирүү)"
+
+#: src/grep.c:1355
+#, c-format
+msgid "warning: %s: %s\n"
+msgstr "эскертүү: %s: %s\n"
+
+#: src/grep.c:1356
+msgid "recursive directory loop"
+msgstr "бирибирине кирген папка айлампасы бар"
+
+#: src/grep.c:1404 src/grep.c:1411
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+msgstr "Колдонулушу: %s [ОПЦИЯ]... ШАБЛОН [ФАЙЛ]...\n"
+
+#: src/grep.c:1406
+#, c-format
+msgid "Try `%s --help' for more information.\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:1421
+#, c-format
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "ШАБЛОН, алдынала тандалгандай, негизги түрдөгү регулярдуу выражение (BRE)\n"
+
+# выражение дегендин кыргызчасын жазыш керек
+#: src/grep.c:1424
+#, c-format
+msgid ""
+"Example: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Regexp selection and interpretation:\n"
+msgstr ""
+"Мисалы: %s -i 'салам дүйнө' menu.h main.c\n"
+"\n"
+"Регулярдуу выражение тандоо жана мааниси:\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"
+" -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 ШАБЛОН кеңейтилген түрдөгү регулярдуу выражение\n"
+" -F, --fixed-strings ШАБЛОН ар сапта бир сөз болгон жыйын\n"
+" -G, --basic-regexp ШАБЛОН негизги түрдөгү регулярдуу выражение\n"
+" -P, --perl-regexp ШАБЛОН Perl түрүндөгү регулярдуу выражение\n"
+
+# выражение!!!!
+#: src/grep.c:1436
+#, c-format
+msgid ""
+" -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=ШАБЛОН ШАБЛОНду регулярдуу выражение катары колдон\n"
+" -f, --file=ФАЙЛ ШАБЛОН ФАЙЛдан алынат\n"
+" -i, --ignore-case тамгалардын чоң-кичинеси айырмаланбайт\n"
+" -w, --word-regexp ШАБЛОН толук сөздөр менен гана уйкаштырылат\n"
+" -x, --line-regexp ШАБЛОН толук сап менен гана уйкаштырылат\n"
+" -z, --null-data дата(данный) саптары 0 байты(EOL эмес) менен бүтөт\n"
+
+#: src/grep.c:1443
+#, c-format
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --invert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
+msgstr ""
+"\n"
+"Түрдүү:\n"
+" -s, --no-messages каталарды көрсөтпөйт\n"
+" -v, --invert-match уйкашы болбогон саптар тандалат\n"
+" -V, --version версия маалыматын көрсөтүп бүтүрөт\n"
+" --help бул жардам маалыматын көрсөтүп бүтүрөт\n"
+" --mmap мүмкүнчүлүк болсо mmap кирүүсү колдонулат\n"
+
+# line - сап деп колдоном
+#: src/grep.c:1451
+#, c-format
+msgid ""
+"\n"
+"Output control:\n"
+" -m, --max-count=NUM stop after NUM matches\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" --line-buffered flush output on every line\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" --binary-files=TYPE assume that binary files are TYPE;\n"
+" TYPE is `binary', `text', or `without-match'\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
+" -d, --directories=ACTION how to handle directories;\n"
+" ACTION is `read', `recurse', or `skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets;\n"
+" ACTION is `read' or `skip'\n"
+" -R, -r, --recursive equivalent to --directories=recurse\n"
+" --include=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=N N жолу уйкаш табылгандан кийин токтойт\n"
+" -b, --byte-offset жыйынтыкта байт жайгашуусу көрсөтүлөт\n"
+" -n, --line-number жыйынтыкта саптын катар номери көрсөтүлөт\n"
+" --line-buffered табылган ар саптан улам жыйынтык көрсөтүлөт\n"
+" -H, --with-filename ар уйкаш үчүн файлдын аты көрсөтүлөт\n"
+" -h, --no-filename жыйынтыкта файлдын аты көрсөтүлбөйт\n"
+" --label=ТАМГА стандарт кирүүдөн келгендерди ТАМГА файлынан деп көрсөтөт\n"
+" -o, --only-matching сапта ШАБЛОН менен уйкаш болгон жер эле көрсөтүлөт\n"
+" -q, --quiet, --silent жазылатурган баардык жыйынтык көрсөтүлбөйт\n"
+" --binary-files=ТҮР бинариктердин түрүн ТҮР катары алат\n"
+" ТҮР - 'binary', 'text', же 'without-match' боло алат\n"
+" -a, --text --binary-files=text менен бирдей\n"
+" -I --binary-files=without-match менен бирдей\n"
+" -d, --directories=ACTION папкаларды кандай иштетерин билдирет\n"
+" ACTION - 'read', 'recurse', же 'skip' боло алат\n"
+" -D, --devices=ACTION аспаптарды, FIFO жана сокеттерди кандай иштетерин билдирет\n"
+" ACTION - 'read' же 'skip' боло алат\n"
+" -R, -r, --recursive --directories=recurse менен бирдей\n"
+" --include=ФАЙЛ_ШАБЛОНУ ФАЙЛ_ШАБЛОНУ менен уйкашкан файлдар гана каралат\n"
+" --exclude=ФАЙЛ_ШАБЛОНУ ФАЙЛ_ШАБЛОНУ менен уйкашкан файл жана папкалар каралбайт\n"
+" --exclude-from=ФАЙЛ ФАЙЛдын ичиндеги шаблондор менен уйкашкан файлдар каралбайт\n"
+" --exclude-dir=ШАБЛОН ШАБЛОН менен уйкашкан папкалар каралбайт\n"
+" -L, --files-without-match эч уйкаш табылбаган файлдардын аты гана көрсөтүлөт\n"
+" -l, --files-with-matches уйкаш табылган файлдардын аты гана жазылат\n"
+" -c, --count ар файлда табылган уйкаш саны гана жазылат\n"
+" -T, --initial-tab табтарды түздөйт (керек болсо)\n"
+" -Z, --null файлдын атынан кийин 0 байты жазылат\n"
+
+#: src/grep.c:1481
+#, c-format
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context=NUM print NUM lines of output context\n"
+" -NUM same as --context=NUM\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to 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"
+msgstr ""
+"\n"
+"Контексти менен жыйынтык чыгаруу:\n"
+" -B, --before-context=N уйкаш болгон саптан мурунку N сап да көрсөтүлөт\n"
+" -A, --after-context=N уйкаш болгон саптан кийинки N сап да көрсөтүлөт\n"
+" -C, --context=N уйкаш болгон саптан мурунку жана кийинки N сап да көрсөтүлөт\n"
+" -N --context=NUM менен бирдей\n"
+" --color[=УЧУР],\n"
+" --colour[=УЧУР] уйкаш сөз кайсы учурда айырмаландырылат\n"
+" УЧУР - `always'(ардайым), `never'(эч качан) же `auto'(авто) боло алат.\n"
+" -U, --binary катар соңунда (EOL) CR тамгасы алынбайт (MSDOS)\n"
+" -u, --unix-byte-offsets орундарды CR жок болгондой кылып көрсөтөт (MSDOS)\n"
+"\n"
+
+#: 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 "ФАЙЛ жазылбаса же ФАЙЛ - (тире) болсо, стандарт кирүү колдонулат. Экиден аз ФАЙЛ берилген болсо -h опциясы бар болот. Эгер сап тандалган болсо бүтүрүү статусу 0 болот, башка учурда 1; эгерде ката чыкса жана -q опциясы берилбеген болсо бүтүрүү статусу 2 болот.\n"
+
+#: src/grep.c:1509
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <%s>.\n"
+msgstr ""
+"\n"
+"Каталарды бул жерге жибергиле <%s>.\n"
+
+#: src/grep.c:1522
+msgid "conflicting matchers specified"
+msgstr "уйкаштыруучуларда конфликттер табылды"
+
+# kandai koldpnulat bilbeim.
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "GREP_COLORS=\"%s\" дегенде, \"%s\" көлөмүнө маани жазылыш керек (\"=...\"); колдонулбайт."
+
+# kandai koldpnulat bilbeim.
+#: 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\"); колдонулбайт."
+
+# kandai koldpnulat bilbeim.
+#: 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 "аспап методу белгисиз"
+
+#: src/grep.c:1956
+msgid "unknown directories method"
+msgstr "папка методу белгисиз"
+
+#: src/grep.c:2023
+msgid "invalid max count"
+msgstr "максимум сан жарабайт"
+
+#: src/grep.c:2078
+msgid "unknown binary-files type"
+msgstr "белгисиз файл түрү"
+
+# FSF котормосу ;)
+#: src/grep.c:2182
+#, c-format
+msgid "Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n"
+msgstr "Укуктары сакталган (C) 1988, 1992-2002, 2004, 2005 Эркин Программа Фонду (FSF)\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"
+msgstr ""
+"Бул эркин колдонулуучу программа; копиясын алуу үчүн коддордо жазылган\n"
+"шарттарды караңыз. Бул программанын эч убадасы ЖОК; керек болсо СООДА же\n"
+"БИР МАКСАТКА ЫҢГАЙЛУУ болуусуна да убада жок.\n"
+
+#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Бул --disable-perl-regexp опциясы менен жасалган, -P опциясы кошулуу эмес"
+
+#: src/search.c:632
+msgid "The -P and -z options cannot be combined"
+msgstr "-P жана -z опциялары чогуу колдонулбайт"
+
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "-P опциясы бир гана шаблон ала алат"
+
+#: lib/error.c:117
+msgid "Unknown system error"
+msgstr "Белгисиз система катасы"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' опциясы так эмес\n"
+
+#: lib/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' опциясы менен аргумент колдонулбайт\n"
+
+#: lib/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' опциясы менен аргумент колдонулбайт\n"
+
+#: lib/getopt.c:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' опциясы менен аргумент болуш керек\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: бул опция түшүнүксүз `--%s'\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: бул опция түшүнүксүз `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: мындай опция колдонулбайт -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: жараксыз опция -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:815 lib/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: бул опциянын аргументи болуш керек -- %c\n"
+
+#: lib/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' опциясы так эмес\n"
+
+#: lib/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' опциясы менен аргумент колдонулбайт\n"
+
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'". If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK). A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#: lib/quotearg.c:259
+msgid "`"
+msgstr "\""
+
+#: lib/quotearg.c:260
+msgid "'"
+msgstr "\""
diff --git a/po/nb.po b/po/nb.po
index cc84c099..955d0cde 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2004-02-13 23:59+0100\n"
"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -57,8 +57,8 @@ msgstr "Ubalansert )"
msgid "out of memory"
msgstr "tomt for minne"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "minnet oppbrukt"
@@ -66,48 +66,48 @@ msgstr "minnet oppbrukt"
msgid "invalid context length argument"
msgstr "ugyldig kontekstlengde"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "for mye inndata til telle"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binr fil %s samsvarer\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standard inn)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "advarsel: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "rekursiv katalog-lkke"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Bruk: %s [FLAGG]... MNSTER [FIL]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prv %s --help for mer informasjon.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Bruk: %s [FLAGG]... MNSTER [FIL] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"Regulrt utvalg og fortolkning:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,7 +132,7 @@ msgstr ""
" -G, --basic-regexp MNSTER er et grunnleggende regulrt uttrykk\n"
" -P, --perl-regexp MNSTER er et regulrt uttrykk p Perl-format\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -148,7 +148,7 @@ msgstr ""
" -x, --line-regexp MNSTER m stemme overens med hele linjer\n"
" -z, --null-data en datalinje slutter med en 0-byte, ikke linjeskift\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,7 +166,7 @@ msgstr ""
" --help vis denne helpeteksten og avslutt\n"
" --mmap bruk minne-mappet inndata hvis mulig\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -225,7 +225,7 @@ msgstr ""
" -c, --count bare skriv ut antall samsvarende linjer per FIL\n"
" -Z, --null skriv 0-byte etter FIL-navn\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -258,45 +258,44 @@ msgstr ""
" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
" (MSDOS)\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Rapportr feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "motsigende skeuttrykk spesifisert"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "ukjent enhetmetode"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "ukjent katalogmetode"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "ugyldig maksantall"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "ukjent binrfiltype"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/nl.po b/po/nl.po
index 4c35ce9e..5bc9932f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,33 +1,35 @@
-# Translation of grep-2.5.1a to Dutch.
-# Copyright (C) 1996, 2000, 2004, 2005 Free Software Foundation, Inc.
+# Translation of grep-2.5.3 to Dutch.
+# Copyright (C) 1996, 2000, 2004, 2005, 2007 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@nietvergeten.nl>, 2005.
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.1a\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2005-11-06 19:50+0100\n"
-"Last-Translator: Benno Schulenberg <benno@nietvergeten.nl>\n"
+"Project-Id-Version: grep 2.5.3\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"
"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:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
-msgstr "Onvoldoende geheugen"
+msgstr "Onvoldoende geheugen beschikbaar"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: 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
msgid "Unbalanced ["
msgstr "Ongepaarde ["
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
msgstr "Onafgemaakte \\ stuurcode"
@@ -35,98 +37,108 @@ msgstr "Onafgemaakte \\ stuurcode"
#. {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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
msgstr "Onafgemaakt herhalingsaantal"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
msgstr "Onjuist herhalingsaantal"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
msgstr "Ongepaarde ("
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
msgstr "Geen syntax opgegeven"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
msgstr "Ongepaarde )"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "Onvoldoende geheugen"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
-msgstr "Onvoldoende geheugen"
+msgstr "onvoldoende geheugen beschikbaar"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "Ongeldig argument voor contextlengte"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
msgstr "Invoer is te groot om te kunnen tellen"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
msgstr "schrijven van uitvoer..."
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binair bestand %s komt overeen\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(standaardinvoer)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "Waarschuwing: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "Oneindige lus in de mappen"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Gebruik: %s [OPTIE]... PATROON [BESTAND]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Probeer '%s --help' voor meer informatie.\n"
+msgstr "Typ '%s --help' voor meer informatie.\n"
-#: src/grep.c:1053
+#: src/grep.c:1412
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Gebruik: %s [OPTIE]... PATROON [BESTAND]...\n"
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Naar PATROON zoeken in ieder gegeven BESTAND, of in standaardinvoer.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "PATROON is een uitgebreide reguliere expressie (ERE).\n"
-#: src/grep.c:1054
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "PATROON is een serie tekenreeksen, elk op een aparte regel.\n"
+
+#: src/grep.c:1421
+#, c-format
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "PATROON is standaard een gewone reguliere expressie (BRE).\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 ""
-"Zoek naar PATROON in ieder gegeven BESTAND of in standaardinvoer.\n"
"Voorbeeld: %s -i 'hallo wereld' menu.h main.c\n"
"\n"
"Selectie en interpretatie van reguliere expressies:\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 PATROON is een uitgebreide reguliere expressie\n"
@@ -135,23 +147,25 @@ msgstr ""
" -G, --basic-regexp PATROON is een gewone reguliere expressie\n"
" -P, --perl-regexp PATROON is een reguliere Perl-expressie\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=PATROON gebruik PATROON als reguliere expressie\n"
-" -f, --file=BESTAND haal het patroon uit BESTAND\n"
-" -i, --ignore-case negeer verschil tussen hoofd- en kleine letters\n"
-" -w, --word-regexp het patroon komt alleen overeen met heel woord\n"
-" -x, --line-regexp het patroon komt alleen overeen met hele regel\n"
-" -z, --null-data regels eindigen op 0 byte, niet op LF-teken\n"
-
-#: src/grep.c:1071
+" -e, --regexp=PATROON dit PATROON bij het zoeken gebruiken\n"
+" -f, --file=BESTAND patronen uit dit BESTAND halen\n"
+" -i, --ignore-case verschil tussen hoofd- en kleine letters negeren\n"
+" -w, --word-regexp patronen komen alleen overeen met een heel woord\n"
+" -x, --line-regexp patronen komen alleen overeen met een hele regel\n"
+" -z, --null-data regels eindigen op 0-byte, niet op LF-teken\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -163,13 +177,14 @@ msgid ""
msgstr ""
"\n"
"Diversen:\n"
-" -s, --no-messages onderdruk foutmeldingen\n"
-" -v, --invert-match selecteer de niet-overeenkomende regels\n"
-" -V, --version toon versie-informatie en stop\n"
-" --help toon deze hulptekst en stop\n"
-" --mmap gebruik indien mogelijk de mmap-leesfunctie\n"
+" -s, --no-messages foutmeldingen onderdrukken\n"
+" -v, --invert-match de niet-overeenkomende regels selecteren\n"
+" -V, --version versie-informatie tonen en stoppen\n"
+" --help deze hulptekst tonen en stoppen\n"
+" --mmap invoer geheel in geheugen plaatsen, indien mogelijk\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -182,57 +197,61 @@ 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"
"Uitvoeropties:\n"
-" -m, --max-count=AANTAL stop na AANTAL overeenkomsten\n"
-" -b, --byte-offset geef het byteadres bij de uitvoerregels\n"
-" -n, --line-number geef het regelnummer bij de uitvoerregels\n"
-" --line-buffered produceer uitvoer na elke gevonden regel\n"
-" -H, --with-filename geef de bestandsnaam bij iedere overeenkomst\n"
-" -h, --no-filename onderdruk het toevoegen van de bestandsnaam\n"
-" --label=LABEL geef LABEL als naam van standaardinvoer\n"
-" -o, --only-matching geef alleen het overeenkomende regelfragment\n"
-" -q, --quiet, --silent onderdruk alle normale uitvoer\n"
-" --binary-files=TYPE neem aan dat binaire bestanden van TYPE zijn;\n"
+" -m, --max-count=AANTAL na dit AANTAL overeenkomsten stoppen\n"
+" -b, --byte-offset het byte-adres bij de uitvoerregels tonen\n"
+" -n, --line-number het regelnummer bij de uitvoerregels tonen\n"
+" --line-buffered na elke gevonden regel uitvoer produceren\n"
+" -H, --with-filename bij iedere overeenkomst de bestandsnaam tonen\n"
+" -h, --no-filename nooit de bestandsnaam tonen\n"
+" --label=LABEL dit LABEL als naam voor standaardinvoer gebruiken\n"
+" -o, --only-matching alleen het overeenkomende regelfragment tonen\n"
+" -q, --quiet, --silent alle normale uitvoer onderdrukken\n"
+" --binary-files=TYPE aannemen dat binaire bestanden van dit TYPE zijn;\n"
" TYPE is 'binary' (binair), 'text' (als tekst),\n"
" of 'without-match' (alsof geen overeenkomsten)\n"
-" -a, --text hetzelfde als --binary-files=text\n"
-" -I hetzelfde als --binary-files=without-match\n"
-" -d, --directories=ACTIE behandel mappen met ACTIE;\n"
+" -a, --text hetzelfde als '--binary-files=text'\n"
+" -I hetzelfde als '--binary-files=without-match'\n"
+" -d, --directories=ACTIE mappen behandelen met deze ACTIE;\n"
" ACTIE is 'read', 'recurse' of 'skip'\n"
" (ofwel lezen, in-afdalen, of overslaan)\n"
-" -D, --devices=ACTIE behandel apparaten, FIFOs en sockets met ACTIE;\n"
+" -D, --devices=ACTIE apparaten, FIFO's en sockets behandelen met ACTIE;\n"
" ACTIE is 'read' of 'skip' (lezen of overslaan)\n"
-" -R, -r, --recursive hetzelfde als --directories=recurse\n"
-" --include=BESTANDSPATROON onderzoek alleen bestanden die aan\n"
+" -R, -r, --recursive hetzelfde als '--directories=recurse'\n"
+" --include=BESTANDSPATROON alleen bestanden doorzoeken die aan\n"
" BESTANDSPATROON voldoen\n"
-" --exclude=BESTANDSPATROON sla bestanden over die aan BESTANDSPATROON\n"
+" --exclude=BESTANDSPATROON bestanden overslaan die aan BESTANDSPATROON\n"
" voldoen\n"
-" --exclude-from=BESTAND sla bestanden over die aan een patroon in\n"
+" --exclude-from=BESTAND bestanden overslaan die aan een patroon in\n"
" BESTAND voldoen\n"
-" -L, --files-without-match geef alleen bestandsnamen zonder overeenkomst\n"
-" -l, --files-with-matches geef alleen bestandsnamen met overeenkomsten\n"
-" -c, --count geef alleen het aantal overeenkomsten per bestand\n"
-" -Z, --null print een 0 byte na iedere bestandsnaam\n"
+" -L, --files-without-match alleen bestandsnamen zonder overeenkomst tonen\n"
+" -l, --files-with-matches alleen bestandsnamen met overeenkomsten tonen\n"
+" -c, --count alleen het aantal overeenkomsten per bestand tonen\n"
+" -T, --initial-tab tabs uitlijnen (eventueel een tab-teken invoegen)\n"
+" -Z, --null een 0-byte invoegen na iedere bestandsnaam\n"
-#: src/grep.c:1107
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -241,89 +260,142 @@ 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"
"Contextbesturing:\n"
-" -B, --before-context=AANTAL geef AANTAL regels voorafgaande context\n"
-" -A, --after-context=AANTAL geef AANTAL regels nakomende context\n"
-" -C, --context=AANTAL geef AANTAL regels context\n"
-" -AANTAL hetzelfde als --context=AANTAL\n"
+" -B, --before-context=AANTAL dit AANTAL regels voorafgaande context tonen\n"
+" -A, --after-context=AANTAL dit AANTAL regels nakomende context tonen\n"
+" -C, --context=AANTAL dit AANTAL regels context tonen\n"
+" -AANTAL hetzelfde als '--context=AANTAL'\n"
" --color[=WANNEER],\n"
-" --colour[=WANNEER] geef overeenkomende tekst gekleurd weer;\n"
+" --colour[=WANNEER] overeenkomende tekst gekleurd weergeven;\n"
" WANNEER is 'always', 'never' of 'auto'\n"
" (ofwel altijd, nooit, of apparaat-afhankelijk)\n"
-" -U, --binary haal geen CR-tekens weg bij EOL (MSDOS)\n"
-" -u, --unix-byte-offsets geef adressen alsof CRs er niet waren (MSDOS)\n"
+" -U, --binary geen CR-tekens weghalen bij regeleinde (MSDOS)\n"
+" -u, --unix-byte-offsets adressen tonen alsof CR's er niet waren (MSDOS)\n"
"\n"
-"Tot slot: 'egrep' betekent 'grep -E'; 'fgrep' betekent 'grep -F'.\n"
+
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Gebruik van 'egrep' wordt ontraden; het is beter 'grep -E' te gebruiken.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "Gebruik van 'fgrep' wordt ontraden; het is beter 'grep -F' te gebruiken.\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 ""
+"Het gebruik van 'egrep' en 'fgrep' wordt ontraden;\n"
+"'egrep' betekent 'grep -E'; 'fgrep' betekent 'grep -F'.\n"
+"\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 ""
"Indien er geen BESTAND gegeven is, of BESTAND is -, dan wordt standaardinvoer\n"
"gelezen. Indien er minder dan twee BESTANDen gegeven zijn, dan wordt -h\n"
"aangenomen. De afsluitwaarde is 0 in geval van overeenkomsten,\n"
"1 indien geen overeenkomsten, en 2 indien er iets mis is.\n"
-#: src/grep.c:1124
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Meld gebreken in het programma aan <bug-grep@gnu.org>;\n"
+"Rapporteer gebreken in het programma aan <%s>;\n"
"meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "Conflicterende expressiesoorten"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr ""
+"GREP_COLORS='%s' --\n"
+" Kenmerk '%s' vereist een waarde ('=...'); genegeerd."
+
+#: 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' --\n"
+" Kenmerk '%s' is booleaans en verwacht geen waarde ('=%s'); genegeerd."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr ""
+"GREP_COLORS='%s' --\n"
+" Kenmerk '%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' --\n"
+" Tekenreeks is onjuist; verwerking is gestopt voor subreeks '%s'."
+
+#: src/grep.c:1883
msgid "unknown devices method"
msgstr "Onbekende apparaten-actie"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
msgstr "Onbekende mappen-actie"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
msgstr "Ongeldig maximum aantal"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
msgstr "Onbekend binair bestandstype"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %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"
+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:1664
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"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 ""
-"Dit is vrije programmatuur; zie de broncode voor de kopieervoorwaarden.\n"
+"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"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Ondersteuning voor de optie -P is in deze versie niet opgenomen"
-
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Ondersteuning voor de optie '-P' is in deze programmaversie niet opgenomen"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "De opties -P en -z gaan niet samen"
+msgstr "De 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
msgid "Unknown system error"
@@ -404,8 +476,8 @@ msgstr "%s: optie '-W %s' staat geen argument toe\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr "'"
+msgstr "‘"
#: lib/quotearg.c:260
msgid "'"
-msgstr "'"
+msgstr "’"
diff --git a/po/no.po b/po/no.po
deleted file mode 100644
index d20630ac..00000000
--- a/po/no.po
+++ /dev/null
@@ -1,423 +0,0 @@
-# Norwegian messages for GNU Grep version 2.2. (bokml dialect)
-# Copyright (C) 1996 Free Software Foundation, Inc.
-# Karl Anders ygard <karl.oygard@fou.telenor.no>, 1996.
-#
-# Eivind Tagseth <eivindt@multinet.no>, 1997
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: GNU grep 2.2\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 1998-08-01 13:45+0200\n"
-"Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
-"Language-Team: Norwegian <no@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
-msgid "Memory exhausted"
-msgstr "Minnet oppbrukt"
-
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
-msgid "Unbalanced ["
-msgstr "Ubalansert ["
-
-#: src/dfa.c:741
-msgid "Unfinished \\ escape"
-msgstr "Uferdig \\-beskyttelse"
-
-#. Cases:
-#. {M} - exact count
-#. {M,} - minimum count, maximum is infinity
-#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
-msgid "unfinished repeat count"
-msgstr "uferdig gjentagelsesantall"
-
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
-msgid "malformed repeat count"
-msgstr "feilaktig gjentagelsesantall"
-
-#: src/dfa.c:1253
-msgid "Unbalanced ("
-msgstr "Ubalansert ("
-
-#: src/dfa.c:1378
-msgid "No syntax specified"
-msgstr "Ingen syntaks spesifisert"
-
-#: src/dfa.c:1386
-msgid "Unbalanced )"
-msgstr "Ubalansert )"
-
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "tomt for minne"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
-msgid "memory exhausted"
-msgstr "minnet oppbrukt"
-
-#: src/grep.c:205
-msgid "invalid context length argument"
-msgstr "ugyldig kontekstlengde"
-
-#: src/grep.c:479
-msgid "input is too large to count"
-msgstr ""
-
-#: src/grep.c:605
-msgid "writing output"
-msgstr "skriver utdata"
-
-#: src/grep.c:878
-#, c-format
-msgid "Binary file %s matches\n"
-msgstr ""
-
-#: src/grep.c:892
-msgid "(standard input)"
-msgstr "(standard inn)"
-
-#: src/grep.c:997
-#, fuzzy, c-format
-msgid "warning: %s: %s\n"
-msgstr "%s: advarsel: %s: %s\n"
-
-#: src/grep.c:998
-msgid "recursive directory loop"
-msgstr ""
-
-#: src/grep.c:1046
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Bruk: %s [FLAGG]... MNSTER [FIL]...\n"
-
-#: src/grep.c:1048
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Prv %s --help for mer informasjon.\n"
-
-#: src/grep.c:1053
-#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Bruk: %s [FLAGG]... MNSTER [FIL] ...\n"
-
-#: src/grep.c:1054
-#, 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 ""
-
-#: src/grep.c:1059
-msgid ""
-" -E, --extended-regexp PATTERN is an extended regular expression\n"
-" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
-" -G, --basic-regexp PATTERN is a basic regular expression\n"
-" -P, --perl-regexp PATTERN is a Perl regular expression\n"
-msgstr ""
-
-#: src/grep.c:1064
-#, fuzzy
-msgid ""
-" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
-" -f, --file=FILE obtain PATTERN from FILE\n"
-" -i, --ignore-case ignore case distinctions\n"
-" -w, --word-regexp force PATTERN to match only whole words\n"
-" -x, --line-regexp force PATTERN to match only whole lines\n"
-" -z, --null-data a data line ends in 0 byte, not newline\n"
-msgstr ""
-"Sk etter MNSTER i hver FIL eller standard inn.\n"
-"\n"
-"Regexp valg og fortolkning:\n"
-" -E, --extended-regexp MNSTER er et utvidet regulrt uttrykk\n"
-" -F, --fixed-regexp MNSTER er en fast streng separert med linjeskift\n"
-" -G, --basic-regexp MNSTER er et grunnleggende regulrt uttrykk\n"
-" -e, --regexp=MNSTER bruk MNSTER som et regulrt uttrykk\n"
-" -f, --file=FIL hent MNSTER fra FIL\n"
-" -i, --ignore-case se bort ifra forskjellen p store og sm bokstaver\n"
-" -w, --word-regexp MNSTER m stemme overens med hele ord\n"
-" -x, --line-regexp MNSTER m stemme overens med hele linjer\n"
-
-#: src/grep.c:1071
-#, fuzzy
-msgid ""
-"\n"
-"Miscellaneous:\n"
-" -s, --no-messages suppress error messages\n"
-" -v, --invert-match select non-matching lines\n"
-" -V, --version print version information and exit\n"
-" --help display this help and exit\n"
-" --mmap use memory-mapped input if possible\n"
-msgstr ""
-"\n"
-"Diverse:\n"
-" -s, --no-messages undertrykk feilmeldinger\n"
-" -v, --revert-match velg linjer som ikke passer\n"
-" -V, --version vis versioninformasjon og avslutt\n"
-" --help vis denne helpeteksten og avslutt\n"
-
-#: src/grep.c:1079
-#, fuzzy
-msgid ""
-"\n"
-"Output control:\n"
-" -m, --max-count=NUM stop after NUM matches\n"
-" -b, --byte-offset print the byte offset with output lines\n"
-" -n, --line-number print line number with output lines\n"
-" --line-buffered flush output on every line\n"
-" -H, --with-filename print the filename for each match\n"
-" -h, --no-filename suppress the prefixing filename on output\n"
-" --label=LABEL print LABEL as filename for standard input\n"
-" -o, --only-matching show only the part of a line matching PATTERN\n"
-" -q, --quiet, --silent suppress all normal output\n"
-" --binary-files=TYPE assume that binary files are TYPE\n"
-" TYPE is 'binary', 'text', or 'without-match'\n"
-" -a, --text equivalent to --binary-files=text\n"
-" -I equivalent to --binary-files=without-match\n"
-" -d, --directories=ACTION how to handle directories\n"
-" ACTION is 'read', 'recurse', or 'skip'\n"
-" -D, --devices=ACTION how to handle devices, FIFOs and sockets\n"
-" ACTION is 'read' or 'skip'\n"
-" -R, -r, --recursive equivalent to --directories=recurse\n"
-" --include=PATTERN files that match PATTERN will be examined\n"
-" --exclude=PATTERN files that match PATTERN will be skipped.\n"
-" --exclude-from=FILE files that match PATTERN in FILE will be skipped.\n"
-" -L, --files-without-match only print FILE names containing no match\n"
-" -l, --files-with-matches only print FILE names containing matches\n"
-" -c, --count only print a count of matching lines per FILE\n"
-" -Z, --null print 0 byte after FILE name\n"
-msgstr ""
-"\n"
-"Ut-kontroll:\n"
-" -b, --byte-offset skriv tegnposisjon med utlinjene\n"
-" -n, --line-number skriv linjenummeret med utlinjene\n"
-" -H, --with-filename skriv filnavnet for hver treff\n"
-" -h, --no-filename ikke skriv filnavnet\n"
-" -q, --quiet, --silent undertrykk all vanlig utskrift\n"
-" -L, --files-without-match skriv bare ut navnene p FILene som ikke\n"
-" inneholder treff\n"
-" -l, --files-with-matches skriv bare ut navnene p FILene som inneholder\n"
-" treff\n"
-" -c, --count skriv bare ut antall linjer som inneholder treff\n"
-" per FIL\n"
-
-#: src/grep.c:1107
-#, fuzzy
-msgid ""
-"\n"
-"Context control:\n"
-" -B, --before-context=NUM print NUM lines of leading context\n"
-" -A, --after-context=NUM print NUM lines of trailing context\n"
-" -C, --context=NUM print NUM lines of output context\n"
-" -NUM same as --context=NUM\n"
-" --color[=WHEN],\n"
-" --colour[=WHEN] use markers to distinguish the matching string\n"
-" WHEN may be `always', `never' or `auto'.\n"
-" -U, --binary do not strip CR characters at EOL (MSDOS)\n"
-" -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n"
-"\n"
-"`egrep' means `grep -E'. `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input. If less than\n"
-"two FILEs given, assume -h. Exit status is 0 if match, 1 if no match,\n"
-"and 2 if trouble.\n"
-msgstr ""
-"\n"
-"Kontekst-kontroll:\n"
-" -B, --before-context=ANT skriv ANT linjer med ledende kontekst\n"
-" -A, --after-context=ANT skriv ANT linjer med etterflgende kontekst\n"
-" -ANT samme som bde -B ANT og -A ANT\n"
-" -C, --context samme som -2\n"
-" -U, --binary ikke fjern CR-tegn ved EOL (MSDOS)\n"
-" -u, --unix-byte-offsets rapporter posisjoner som om CRene ikke var der\n"
-" (MSDOS)\n"
-
-#: src/grep.c:1124
-#, fuzzy
-msgid ""
-"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
-msgstr ""
-"\n"
-"Rapportr feil til <bug-gnu-utils@prep.ai.mit.edu>.\n"
-
-#: src/grep.c:1134
-#, fuzzy
-msgid "conflicting matchers specified"
-msgstr "skeuttrykk er allerede spesifisert"
-
-#: src/grep.c:1376
-msgid "unknown devices method"
-msgstr ""
-
-#: src/grep.c:1443
-msgid "unknown directories method"
-msgstr ""
-
-#: src/grep.c:1510
-#, fuzzy
-msgid "invalid max count"
-msgstr "uferdig gjentagelsesantall"
-
-#: src/grep.c:1565
-msgid "unknown binary-files type"
-msgstr ""
-
-#: src/grep.c:1660
-#, fuzzy, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "grep (GNU grep) %s\n"
-
-#: src/grep.c:1662
-#, fuzzy
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 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"
-msgstr ""
-"Dette er fri programvare, se kildekoden for kopieringsbetingelser. Det\n"
-"er INGEN garanti, ikke en gang for SALGBARHET eller EGNETHET FOR NOEN \n"
-"SPESIELL OPPGAVE.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr ""
-
-#: src/search.c:619
-msgid "The -P and -z options cannot be combined"
-msgstr ""
-
-#: lib/error.c:117
-msgid "Unknown system error"
-msgstr ""
-
-#: lib/getopt.c:675
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagget %s er flertydig\n"
-
-#: lib/getopt.c:700
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flagget --%s tar ikke argumenter\n"
-
-#: lib/getopt.c:705
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flagget %c%s tar ikke argumenter\n"
-
-#: lib/getopt.c:723 lib/getopt.c:896
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagget %s trenger et argument\n"
-
-#. --option
-#: lib/getopt.c:752
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent flagg --%s\n"
-
-#. +option or -option
-#: lib/getopt.c:756
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent flagg %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: ulovlig flagg -- %c\n"
-
-#: lib/getopt.c:785
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig flagg -- %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: flagget behver et argument -- %c\n"
-
-#: lib/getopt.c:862
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagget -W %s er flertydig\n"
-
-#: lib/getopt.c:880
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flagget -W %s tar ikke argumenter\n"
-
-#. Get translations for open and closing quotation marks.
-#.
-#. The message catalog should translate "`" to a left
-#. quotation mark suitable for the locale, and similarly for
-#. "'". If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
-#.
-#. For example, an American English Unicode locale should
-#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
-#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
-#. MARK). A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
-msgid "`"
-msgstr ""
-
-#: lib/quotearg.c:260
-msgid "'"
-msgstr ""
-
-#~ msgid "option %s"
-#~ msgstr "flagg %s"
-
-#~ msgid " with arg %s"
-#~ msgstr " med arg %s"
-
-#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "tallene forekommer i to forskjellige argv-elementer.\n"
-
-#~ msgid "option %c\n"
-#~ msgstr "flagg %c\n"
-
-#~ msgid "option a\n"
-#~ msgstr "flagg a\n"
-
-#~ msgid "option b\n"
-#~ msgstr "flagg b\n"
-
-#~ msgid "option c with value `%s'\n"
-#~ msgstr "flagg c med verdi %s\n"
-
-#~ msgid "option d with value `%s'\n"
-#~ msgstr "flagg d med verdi %s\n"
-
-#~ msgid "?? getopt returned character code 0%o ??\n"
-#~ msgstr "?? getopt returnerte tegnverdien 0%o ??\n"
-
-#~ msgid "non-option ARGV-elements: "
-#~ msgstr "ARGV-elementer som ikke er flagg: "
-
-#~ msgid "you may specify only one of -E, -F, or -G"
-#~ msgstr "du kan bare spesifisere en av -E, -F eller -G"
-
-#~ msgid "memory exhausted\n"
-#~ msgstr "minnet oppbrukt\n"
-
-#~ msgid "(standard input)\n"
-#~ msgstr "(standard inn)\n"
diff --git a/po/pl.po b/po/pl.po
index 62b9eb45..e0791537 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,30 +1,31 @@
# Polish translation of the GNU grep messages
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 2005 Free Software Foundation, Inc.
-# Rafa Maszkowski <rzm@icm.edu.pl>, 1996-2002, 2005.
+# 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.
#
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-03 23:30+0100\n"
+"Project-Id-Version: GNU grep 2.5.3\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"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
msgstr "Pami wyczerpana"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c: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
msgid "Unbalanced ["
msgstr "[ nie do pary"
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
msgstr "Niedokoczona sekwencja \\"
@@ -32,108 +33,119 @@ msgstr "Niedokoczona sekwencja \\"
#. {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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
msgstr "niedokoczona liczba powtrze"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
msgstr "le sformatowana liczba powtrze"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
msgstr "( nie do pary"
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
msgstr "Brak specyfikacji skadni"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
msgstr ") nie do pary"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "brak pamici"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
msgstr "pami wyczerpana"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "bdny argument dugoci kontekstowej"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
msgstr "danych wejciowych jest zbyt duo do policzenia"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
msgstr "zapisuj wyniki"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
msgstr "Plik binarny %s pasuje do wzorca\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(standardowe wejcie)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "uwaga: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "nieskoczona ptla przegldania katalogw"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Napisz `%s --help' eby dowiedzie si wicej.\n"
-#: src/grep.c:1053
+#: src/grep.c:1412
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Uycie: %s [OPCJA]... WZORZEC [PLIK] ...\n"
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Szukanie WZORCA w kadym PLIKU lub na standardowym wejciu\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "WZORZEC jest rozszerzonym wyraeniem 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"
-#: src/grep.c:1054
+#: 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"
+
+#: 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 ""
-"Szukanie WZORCA w kadym pliku lub na standardowym wejciu.\n"
"Przykad: %s -i 'hello world' menu.h main.c\n"
"\n"
"Wybr i interpretacja wyrae regularnych:\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 WZORZEC jest rozszerzonym wyr. regularnym\n"
+" -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\n"
+" -G, --basic-regexp WZORZEC jest podstawowym wyr. regularnym (BRE)\n"
" -P, --perl-regexp WZORZEC jest wyraeniem regularnym perla\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"
@@ -143,12 +155,13 @@ 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 WZORZEC tylko do penych sw\n"
-" -x, --line-regexp dopasowanie WZORZEC tylko do caych linii\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"
" nowej linii\n"
-#: src/grep.c:1071
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,7 +179,8 @@ msgstr ""
" --help wywietl t informacj i zakocz\n"
" --mmap jeeli moliwe mapuj pliki w pamici\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -179,29 +193,31 @@ 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"
"Sterowanie danymi wyjciowymi:\n"
-" -m, --max-count=ILE zatrzymanie po ILE dopasowaniach\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 buf. wyj. po kadej linii\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"
@@ -212,7 +228,7 @@ msgstr ""
" -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"
+" 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"
@@ -224,9 +240,11 @@ msgstr ""
" -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"
-#: src/grep.c:1107
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -235,21 +253,17 @@ 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"
"Sterowanie kontekstem:\n"
-" -B, --before-context=ILE wypisanie ILE linii kontekstu przed\n"
-" -A, --after-context=ILE wypisanie ILE linii kontekstu po\n"
-" -C, --context[=ILE] wypisanie ILE (domylnie 2) linii kontekstu\n"
+" -B, --before-context=ILE wypisanie ILU linii kontekstu przed\n"
+" -A, --after-context=ILE wypisanie ILU linii kontekstu po\n"
+" -C, --context=ILE wypisanie ILU linii kontekstu\n"
" -ILE to samo co --context=ILE\n"
" --color[=KIEDY],\n"
" --colour[=KIEDY] oznaczanie pasujcych znakw,\n"
@@ -258,18 +272,45 @@ msgstr ""
" -U, --binary bez usuwania znakw nowej linii na kocu\n"
" -u, --unix-byte-offsets podawanie pozycji tak jakby nie byo CRw (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"
+
+#: 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"
+
+#: 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' oznacza `grep -E'. `fgrep' oznacza `grep -F'.\n"
-"Bez PLIKu albo gdy PLIK to -, czytane jest standardowe wejcie. Jeeli\n"
-"podano mniej ni dwa PLIKi, zakada -h. Zakoczenie z kodem 0 jeeli\n"
-"WZORZEC pasuje, z 1, jeeli nie, z 2, jeeli s problemy.\n"
+"Uywanie nazw `egrep' i `fgrep' jest przestarzae.\n"
-#: src/grep.c:1124
+#: 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 ""
+"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"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Raporty o bdach naley wysya do bug-grep@gnu.org.\n"
+"Raporty o bdach naley wysya do %s .\n"
# viendo los fuentes , hay varias opciones
# que hay sin documentar. O quiza es que getopt() lo he entendido mal
@@ -279,52 +320,73 @@ msgstr ""
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
# La opcin -X es a la que corresponde esta lnea.
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "podane sprzeczne wzorce"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, 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."
+
+#: src/grep.c:1719
+#, 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."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "W GREP_COLORS=\"%s\", wasno \"%s\" to %s."
+
+#: src/grep.c:1750
+#, 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\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
msgstr "nieznany sposb przegldania urzdze"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
msgstr "nieznany sposb przegldania katalogw"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
msgstr "bdna maksymalna liczba powtrze"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
msgstr "nieznany typ pliku binarnego"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+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:1662
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-
-#: src/grep.c:1664
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
"Oprogramowanie darmowe. Warunki kopiowania zamieszczone s w kodzie rdowym.\n"
"Nie podlega adnej gwarancji, nawet gwarancji przydatnoci do jakiegokolwiek\n"
"zastosowania lub sprzeday.\n"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Opcja -P nie jest obsugiwana"
-
#: 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"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
msgstr "Opcje -P i -z nie mog wystpowa razem"
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Opcja -P moe by uyta tylko do pojedynczego wzorca"
+
#: lib/error.c:117
msgid "Unknown system error"
msgstr "Nieznany bd systemowy"
diff --git a/po/pt.po b/po/pt.po
index 5107b9c7..8bd7765c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2003-04-09 00:07+0100\n"
"Last-Translator: Rui Malheiro <rmalheiro@6mil.pt>\n"
"Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -57,8 +57,8 @@ msgstr ") sem correspondência"
msgid "out of memory"
msgstr "sem memória"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memória esgotada"
@@ -66,48 +66,48 @@ msgstr "memória esgotada"
msgid "invalid context length argument"
msgstr "número de linhas de contexto inválido"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "ficheiro demasiado grande para manter contagem"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "a escrever o resultado"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Padrão encontrado no ficheiro binário %s\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(standard input)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "aviso: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "directoria em ciclo recursivo"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Utilização: %s [OPÇÃO]... PADRÃO [FICHEIRO]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Experimente `%s --help' para mais informação.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Utilização: %s [OPÇÃO]... PADRÃO [FICHEIRO] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"Selecção e interpretação de regexp\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,7 +132,7 @@ msgstr ""
" -G, --basic-regexp PADRÃO é uma expressão regular básica\n"
" -P, --perl-regexp PADRÃO é uma expressão regular de Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -148,7 +148,7 @@ msgstr ""
" -x, --line-regexp forçar PADRÃO a igualar apenas a linhas completas\n"
" -z, --null-data uma linha é terminada com o byte 0, não com newline\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,7 +166,7 @@ msgstr ""
" --help apresenta este texto de auxílio e termina\n"
" --mmap utilizar 'memory-mapped input' se possível\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -226,7 +226,7 @@ msgstr ""
" número de linhas que satisfazem PADRÃO\n"
" -Z, --null imprimir o byte 0 após cada nome de FICHEIRO\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -263,45 +263,44 @@ msgstr ""
"dois FICHEIROS, assume -h. Devolve 0 se encontrar pelo menos uma occorência\n"
"de PADRÃO, 1 se não encontrar, 2 se tiver algum problema.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Reporte «bugs» para <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "foram especificados métodos de pesquisa incompatíveis"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "método para acesso a «devices» desconhecido"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "método para acesso a directorias desconhecido"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "número máximo inválido"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo de ficheiro binário desconhecido"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Direitos de autor 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-#: src/grep.c:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6056d9f2..d70b51e7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\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"
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -22,10 +22,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr "Memria esgotada"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr "[ desbalanceado"
@@ -61,8 +58,7 @@ msgstr ") desbalanceado"
msgid "out of memory"
msgstr "memria esgotada"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memria esgotada"
@@ -70,48 +66,48 @@ msgstr "memria esgotada"
msgid "invalid context length argument"
msgstr "argumento comprimento do contexto invlido"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "entrada longa de mais para contar"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "escrevendo sada"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Arquivo binrio %s casa com o padro\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(entrada padro)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "aviso: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "loop de diretrio recursivo"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uso: %s [OPO]... PADRO [ARQUIVO]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informaes.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Uso: %s [OPO]... PADRO [ARQUIVO]...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -124,7 +120,7 @@ msgstr ""
"\n"
"Seleo e interpretao de expresso regular:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -136,7 +132,7 @@ msgstr ""
" -G, --basic-regexp PADRO um expresso regular bsica\n"
" -P, --perl-regexp PADRO uma expresso regular Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -152,7 +148,7 @@ msgstr ""
" -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:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -170,7 +166,7 @@ msgstr ""
" --help exibe esta ajuda e sai\n"
" --mmap usa entrada mapeada em memria se possvel\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -231,7 +227,7 @@ msgstr ""
" por ARQUIVO\n"
" -Z, --null mostra byte 0 depois do nome do ARQUIVO\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -268,45 +264,44 @@ msgstr ""
"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:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Informe problemas para <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "especificados padres de procura conflitantes"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "mtodo desconhecido de dispositivos"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "mtodo desconhecido de diretrios"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "valor mximo invlido"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tipo de arquivo binrio desconhecido"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ro.po b/po/ro.po
index 856a77a1..07169079 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep-2.5g.ro\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2003-04-19 02:47+0000\n"
"Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -57,8 +57,8 @@ msgstr ") fra pereche"
msgid "out of memory"
msgstr "memorie plin"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "memorie plin"
@@ -66,48 +66,48 @@ msgstr "memorie plin"
msgid "invalid context length argument"
msgstr "parametru lungime context invalid"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "intrarea(input) este prea mare pentru numrare"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "scriere output"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Fiierul binar %s corespunde\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(intrare standard)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "avertisment: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "bucl recursiv de directoare"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Folosire: %s [OPIUNE]... TIPAR [FIIER]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "ncercai `%s --help' pentru mai multe informaii.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Folosire: %s [OPIUNE]... TIPAR [FIIER]...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +120,7 @@ msgstr ""
"\n"
"Selecie i interpretare regexp:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -132,7 +132,7 @@ msgstr ""
" -G, --basic-regexp TIPAR este o expresie exact primar\n"
" -P, --perl-regexp TIPAR este o expresie exact Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -148,7 +148,7 @@ msgstr ""
" -x, --line-regexp foreaz TIPAR s corespund doar liniilor ntregi\n"
" -z, --null-data linia de date se termin n octet 0, nu linie_nou\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -166,7 +166,7 @@ msgstr ""
" --help afieaz acest ajutor i termin\n"
" --mmap folosete intrare memory-mapped dac e posibil\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -224,7 +224,7 @@ msgstr ""
" -c, --count afieaz doar numrul de potriviri per FIIER\n"
" -Z, --null tiprete octet 0 dup nume FIIER\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -260,45 +260,44 @@ msgstr ""
"mai puin de 2 FIIERe, se presupune -h. Starea de ieire e 0 pentru\n"
"corespunztor, 1 pentru necorespunztor, i 2 pentru probleme.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Raportai buguri la <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "conflicte ntre cuttorii (matchers) specificai"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "metod dispozitive(devices) necunoscut"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "metod directoare necunoscut"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "numrare maxim invalid"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "tip fiiere-binare necunoscut"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/ru.po b/po/ru.po
index 760f7451..3513ced7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\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"
@@ -18,10 +18,7 @@ msgstr ""
msgid "Memory exhausted"
msgstr " "
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545 src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001 src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036 src/dfa.c:1048 src/dfa.c:1049
msgid "Unbalanced ["
msgstr " ["
@@ -57,8 +54,7 @@ msgstr " )"
msgid "out of memory"
msgstr " "
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr " "
@@ -66,48 +62,48 @@ msgstr " "
msgid "invalid context length argument"
msgstr " "
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr " , "
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr " "
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr " %s \n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "( )"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr ": %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr " "
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s [OPTION]... PATTERN [FILE]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " `%s --help' .\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s [OPTION]... PATTERN [FILE] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -120,7 +116,7 @@ msgstr ""
"\n"
" :\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,7 +129,7 @@ msgstr ""
" -G, --basic-regexp PATTERN \n"
" -P, --perl-regexp PATTERN Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -153,7 +149,7 @@ msgstr ""
" -z, --null-data 0, \n"
" \n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -171,7 +167,7 @@ msgstr ""
" --help \n"
" --mmap mmap \n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -230,7 +226,7 @@ msgstr ""
" -c, --count \n"
" -Z, --null 0 \n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -268,45 +264,44 @@ msgstr ""
", , -h. 0 ,\n"
" 1, . 2, .\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
" <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr " "
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr " "
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr " "
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr " "
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr " "
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: 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:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/rw.po b/po/rw.po
index 9180b262..820e630f 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -1,5 +1,15 @@
# Kinyarwanda translations for grep package.
# Copyright (C) 2005 Free Software Foundation, Inc.
+# Steve Murphy <murf@e-tools.com>, 2005.
+# Steve performed initial rough translation from compendium built from translations provided by the following translators:
+# Philibert Ndandali <ndandali@yahoo.fr>, 2005.
+# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
+# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
+# Carole Karema <karemacarole@hotmail.com>, 2005.
+# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
+# Augustin KIBERWA <akiberwa@yahoo.co.uk>, 2005.
+# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
+# Antoine Bigirimana <antoine@e-tools.com>, 2005.
# This file is distributed under the same license as the grep package.
# Steve Murphy <murf@e-tools.com>, 2005.
# Steve performed initial rough translation from compendium built from translations provided by the following translators:
@@ -14,8 +24,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.1a\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"Project-Id-Version: grep 2.5\n"
+"POT-Creation-Date: 2002-03-13 15:14+0100\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -84,47 +94,47 @@ msgstr "Sibyo Imvugiro Uburebure"
msgid "input is too large to count"
msgstr "Iyinjiza ni Binini Kuri IBARA"
-#: src/grep.c:605
+#: src/grep.c:601
#, fuzzy
msgid "writing output"
msgstr "Ibisohoka"
-#: src/grep.c:878
+#: src/grep.c:874
#, fuzzy, c-format
msgid "Binary file %s matches\n"
msgstr "IDOSIYE"
-#: src/grep.c:892
+#: src/grep.c:888
#, fuzzy
msgid "(standard input)"
msgstr "(Bisanzwe Iyinjiza"
-#: src/grep.c:997
+#: src/grep.c:993
#, fuzzy, c-format
msgid "warning: %s: %s\n"
msgstr "Iburira"
-#: src/grep.c:998
+#: src/grep.c:994
#, fuzzy
msgid "recursive directory loop"
msgstr "bushyinguro"
-#: src/grep.c:1046
+#: src/grep.c:1042
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ""
-#: src/grep.c:1048
+#: src/grep.c:1044
#, fuzzy, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "kugirango Birenzeho Ibisobanuro"
-#: src/grep.c:1053
+#: src/grep.c:1049
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ""
-#: src/grep.c:1054
+#: src/grep.c:1050
#, fuzzy, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -133,7 +143,7 @@ msgid ""
"Regexp selection and interpretation:\n"
msgstr "kugirango in Cyangwa Bisanzwe Iyinjiza Urugero i Muraho Ibikubiyemo h Ihitamo Na"
-#: src/grep.c:1059
+#: src/grep.c:1055
#, fuzzy
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
@@ -142,7 +152,7 @@ msgid ""
" -P, --perl-regexp PATTERN is a Perl regular expression\n"
msgstr "-E Byongerewe... ni Byongerewe... Ibisanzwe BIHAMYE Ikurikiranyanyuguti ni a Gushyiraho Bya BASIC ni a BASIC Ibisanzwe Perl ni a Ibisanzwe"
-#: src/grep.c:1064
+#: src/grep.c:1060
#, fuzzy
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
@@ -153,7 +163,7 @@ msgid ""
" -z, --null-data a data line ends in 0 byte, not newline\n"
msgstr "-E Gukoresha Nka a Ibisanzwe F IDOSIYE Bivuye i Kwirengagiza Kwirengagiza W ijambo Kuri BIHUYE X Umurongo Kuri BIHUYE Z NTAGIHARI Ibyatanzwe a Ibyatanzwe Umurongo in 0 Bayite OYA"
-#: src/grep.c:1071
+#: src/grep.c:1067
#, fuzzy
msgid ""
"\n"
@@ -165,7 +175,7 @@ msgid ""
" --mmap use memory-mapped input if possible\n"
msgstr "S Oya Ubutumwa Ikosa v Gucurika BIHUYE Guhitamo V Verisiyo Gucapa Verisiyo Ibisobanuro Na Ifashayobora Kugaragaza iyi Ifashayobora Na Gukoresha Ububiko Iyinjiza NIBA"
-#: src/grep.c:1079
+#: src/grep.c:1075
#, fuzzy
msgid ""
"\n"
@@ -197,7 +207,7 @@ msgid ""
" -Z, --null print 0 byte after FILE name\n"
msgstr "Igenzura M KININI IBARA Guhagarara Nyuma B Bayite Nta- boneza Gucapa i Bayite Nta- boneza Na: Ibisohoka N Umurongo Umubare Gucapa Umurongo Umubare Na: Ibisohoka Umurongo Ibisohoka ku buri H Na: Izina ry'idosiye: Gucapa i Izina ry'idosiye: kugirango h Oya Izina ry'idosiye: i Izina ry'idosiye: ku Akarango Gucapa Nka Izina ry'idosiye: kugirango Bisanzwe o Garagaza i Bya a Umurongo Q Byose Bisanzwe Nyabibiri Idosiye Nyabibiri Idosiye ni Cyangwa a Umwandiko Kuri Nyabibiri Idosiye Kuri Nyabibiri Idosiye D ububiko bw'amaderese Kuri ni Cyangwa Kuri Na ni Cyangwa R Kuri ububiko bw'amaderese Gushyiramo Idosiye BIHUYE Idosiye BIHUYE Bivuye Idosiye BIHUYE in Idosiye BIHUYE Gucapa Amazina Oya L Idosiye Na: Gucapa Amazina C IBARA Gucapa a IBARA Bya Imirongo NTAGIHARI Gucapa 0 Bayite Nyuma"
-#: src/grep.c:1107
+#: src/grep.c:1103
#, fuzzy
msgid ""
"\n"
@@ -218,47 +228,47 @@ msgid ""
"and 2 if trouble.\n"
msgstr "Igenzura Mbere Imvugiro Gucapa Imirongo Bya Nyobora A Nyuma Imvugiro Gucapa Imirongo Bya C Imvugiro Gucapa Imirongo Bya Ibisohoka Nka Imvugiro Ibara Gukoresha Kuri i Gicurasi Cyangwa U Nyabibiri OYA Inyuguti ku u Bayite Icyegeranyo Nka NIBA OYA Oya Cyangwa Ryari: ni Gusoma Bisanzwe Iyinjiza Birutwa h Imimerere ni 0 NIBA BIHUYE 1. NIBA Oya BIHUYE Na 2. NIBA"
-#: src/grep.c:1124
+#: src/grep.c:1120
#, fuzzy
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr "org."
-#: src/grep.c:1134
+#: src/grep.c:1130
msgid "conflicting matchers specified"
msgstr ""
-#: src/grep.c:1376
+#: src/grep.c:1367
#, fuzzy
msgid "unknown devices method"
msgstr "Kitazwi Uburyo"
-#: src/grep.c:1443
+#: src/grep.c:1434
#, fuzzy
msgid "unknown directories method"
msgstr "Kitazwi ububiko bw'amaderese Uburyo"
-#: src/grep.c:1510
+#: src/grep.c:1501
#, fuzzy
msgid "invalid max count"
msgstr "Sibyo KININI IBARA"
-#: src/grep.c:1565
+#: src/grep.c:1555
#, fuzzy
msgid "unknown binary-files type"
msgstr "Kitazwi Nyabibiri Idosiye Ubwoko"
-#: src/grep.c:1660
+#: src/grep.c:1650
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1662
+#: src/grep.c:1652
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1664
+#: src/grep.c:1654
#, fuzzy
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 00000000..1a80c0f7
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,465 @@
+# Translation of grep to Slovak
+#
+# Copyright (C) 1997-99, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Ivan Masár <helix84@centrum.sk>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: grep 2.5.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-03 22:01+0200\n"
+"PO-Revision-Date: 2007-08-08 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
+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
+msgid "Unbalanced ["
+msgstr "[ bez náprotivku"
+
+#: src/dfa.c:788
+msgid "Unfinished \\ escape"
+msgstr "Nedokončená \\ escape sekvencia"
+
+#. 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
+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
+msgid "malformed repeat count"
+msgstr "Zle formulovaný počet opakovaní"
+
+#: src/dfa.c:1305
+msgid "Unbalanced ("
+msgstr "( bez náprotivku"
+
+#: src/dfa.c:1430
+msgid "No syntax specified"
+msgstr "Neuvedená syntax"
+
+#: src/dfa.c:1438
+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
+msgid "memory exhausted"
+msgstr "pamäť bola vyčerpaná"
+
+#: src/grep.c:404
+msgid "invalid context length argument"
+msgstr "neplatný argument dĺžky kontextu"
+
+#: src/grep.c:665
+msgid "input is too large to count"
+msgstr "vstup je príliš veľký, aby sa dal spočítať"
+
+#: src/grep.c:927
+msgid "writing output"
+msgstr "zapisuje sa výstup"
+
+#: src/grep.c:1209
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr "Binárny súbor %s sa zhoduje\n"
+
+#: src/grep.c:1223
+msgid "(standard input)"
+msgstr "(štandardný vstup)"
+
+#: src/grep.c:1355
+#, c-format
+msgid "warning: %s: %s\n"
+msgstr "varovanie: %s: %s\n"
+
+#: src/grep.c:1356
+msgid "recursive directory loop"
+msgstr "rekurzívna slučka v adresári"
+
+#: src/grep.c:1404 src/grep.c:1411
+#, c-format
+msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
+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"
+
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Hľadať VZORKU v každom SÚBORE alebo na štandardnom vstupe.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "VZORKA je rozšírený regulárny výraz (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "VZORKA je množina pevných reťazcov oddelených znakom nového riadka.\n"
+
+#: src/grep.c:1421
+#, c-format
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "VZORKA je štandardne základný regulárny výraz (BRE).\n"
+
+#: src/grep.c:1424
+#, c-format
+msgid ""
+"Example: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Regexp selection and interpretation:\n"
+msgstr ""
+"Príklad: %s -i 'hello world' menu.h main.c\n"
+"\n"
+"Výber a interpretácia regulárneho výrazu:\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"
+" -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 VZORKA je rozšírený regular expression (ERE)\n"
+" -F, --fixed-strings VZORKA je množina pevných reťazcov\n"
+" oddelených znakom nového riadka\n"
+" -G, --basic-regexp VZORKA je základný regulárny výraz (BRE)\n"
+" -P, --perl-regexp VZORKA je perlovský regulárny výraz\n"
+
+#: src/grep.c:1436
+#, c-format
+msgid ""
+" -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=VZORKA použiť na hľadanie VZORKU\n"
+" -f, --file=SÚBOR získať VZORKU zo SÚBORU\n"
+" -i, --ignore-case ignorovať rozdiely vo veľkosti písmen\n"
+" -w, --word-regexp vynútiť, aby VZORKA zodpovedala len celým slovám\n"
+" -x, --line-regexp vynútiť, aby VZORKA zodpovedala len celým riadkom\n"
+" -z, --null-data údaje končia bajtom 0, nie novým riadkom\n"
+
+#: src/grep.c:1443
+#, c-format
+msgid ""
+"\n"
+"Miscellaneous:\n"
+" -s, --no-messages suppress error messages\n"
+" -v, --invert-match select non-matching lines\n"
+" -V, --version print version information and exit\n"
+" --help display this help and exit\n"
+" --mmap use memory-mapped input if possible\n"
+msgstr ""
+"\n"
+"Rozličné:\n"
+" -s, --no-messages potlačiť chybové správy\n"
+" -v, --invert-match vybrať riadky, ktoré nemajú zhodu\n"
+" -V, --version vypísať informácie o verzii a skončiť\n"
+" --help zobraziť tieto informácie a skončiť\n"
+" --mmap ak je to možné, použiť pamäťovo mapovaný vstup\n"
+
+#: src/grep.c:1451
+#, c-format
+msgid ""
+"\n"
+"Output control:\n"
+" -m, --max-count=NUM stop after NUM matches\n"
+" -b, --byte-offset print the byte offset with output lines\n"
+" -n, --line-number print line number with output lines\n"
+" --line-buffered flush output on every line\n"
+" -H, --with-filename print the filename for each match\n"
+" -h, --no-filename suppress the prefixing filename on output\n"
+" --label=LABEL print LABEL as filename for standard input\n"
+" -o, --only-matching show only the part of a line matching PATTERN\n"
+" -q, --quiet, --silent suppress all normal output\n"
+" --binary-files=TYPE assume that binary files are TYPE;\n"
+" TYPE is `binary', `text', or `without-match'\n"
+" -a, --text equivalent to --binary-files=text\n"
+" -I equivalent to --binary-files=without-match\n"
+" -d, --directories=ACTION how to handle directories;\n"
+" ACTION is `read', `recurse', or `skip'\n"
+" -D, --devices=ACTION how to handle devices, FIFOs and sockets;\n"
+" ACTION is `read' or `skip'\n"
+" -R, -r, --recursive equivalent to --directories=recurse\n"
+" --include=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"
+"Riadenie výstupu:\n"
+" -m, --max-count=POČET zastaviť po POČET zhodách\n"
+" -b, --byte-offset vypísať ofset v bajtoch pri riadkoch výstupu\n"
+" -n, --line-number vypísať číslo riadka pri riadkoch výstupu\n"
+" --line-buffered flush výstupu po každom riadku\n"
+" -H, --with-filename vypísať názov súboru pri každej zhode\n"
+" -h, --no-filename potlačiť prefix názvu súboru na výstupe\n"
+" --label=ŠTÍTOK vypísať ŠTÍTOK ako názov súboru pre štandard. vstup\n"
+" -o, --only-matching zobraziť iba časť riadka zodpovedajúcu VZORKE\n"
+" -q, --quiet, --silent potlačiť všetok normálny výstup\n"
+" --binary-files=TYP predpokladať, že binárne súbory sú zadaného TYPu;\n"
+" TYP je „binary“, „text“ alebo „without-match“\n"
+" -a, --text ekvivalentné s --binary-files=text\n"
+" -I ekvivalentné s --binary-files=without-match\n"
+" -d, --directories=AKCIA ako zaobchádzať s adresármi;\n"
+" AKCIA je „read“, „recurse“ alebo „skip“\n"
+" -D, --devices=AKCIA ako zaobchádzať so zariadeniami, FIFO a socketmi;\n"
+" AKCIA je „read“ alebo „skip“\n"
+" -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-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"
+" -c, --count vypísať iba počet zodpovedajúcich riadkov na SÚBOR\n"
+" -T, --initial-tab zarovnať tabulátory (ak je potrebné)\n"
+" -Z, --null vytlačiť bajt 0 po SÚBORE\n"
+
+#: src/grep.c:1481
+#, c-format
+msgid ""
+"\n"
+"Context control:\n"
+" -B, --before-context=NUM print NUM lines of leading context\n"
+" -A, --after-context=NUM print NUM lines of trailing context\n"
+" -C, --context=NUM print NUM lines of output context\n"
+" -NUM same as --context=NUM\n"
+" --color[=WHEN],\n"
+" --colour[=WHEN] use markers to 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"
+msgstr ""
+"\n"
+"Riadenie kontextu:\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"
+" --color[=KEDY],\n"
+" --colour[=KEDY] použiť značky na vysvietenie zodpoved. reťazcov;\n"
+" KEDY je „always“, „never“ alebo „auto“\n"
+" -U, --binary neodstraňovať znak CR na konci riadka (MSDOS)\n"
+" -u, --unix-byte-offsets oznamovať ofsety ako keby neboli CR (MSDOS)\n"
+"\n"
+
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Vyvolanie príkazu ako „egrep“ sa neodporúča; použite „grep -E“.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "Vyvolanie príkazu ako „fgrep“ sa neodporúča; použite „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“ znamená „grep -E“. „fgrep“ znamená „grep -F“.\n"
+"Priame vyvolanie príkazu ako „egrep“ či „fgrep“ sa neodporúča.\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 ""
+"Bez SÚBORU alebo ak SÚBOR je -, čítať zo štandardného vstupu. Ak sú zadané\n"
+"menej ako dva SÚBORY predpokladať -h. Chybová úroveň je 0 ak bol vybraný\n"
+"nejaký riadok a 1 inak;\n"
+"ak sa vyskytne nejaká chyba a nebolo zadané -q, chybová úroveň je 2.\n"
+
+#: src/grep.c:1509
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <%s>.\n"
+msgstr ""
+"\n"
+"Oznamovať chyby <%s>.\n"
+
+#: src/grep.c:1522
+msgid "conflicting matchers specified"
+msgstr "boli zadané konfliktné špecifikátory"
+
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+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."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "V 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 "Prerušené spracovanie zle utvoreného GREP_COLORS=\"%s\" na zvyšnom podreťazci \"%s\"."
+
+#: src/grep.c:1883
+msgid "unknown devices method"
+msgstr "neznáme metódy zariadení"
+
+#: src/grep.c:1956
+msgid "unknown directories method"
+msgstr "neznáme metódy adresárov"
+
+#: src/grep.c:2023
+msgid "invalid max count"
+msgstr "neplatný maximálny počet"
+
+#: src/grep.c:2078
+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"
+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"
+
+#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Podpora voľby -P nie je vkompilovaná do tejto binárky --disable-perl-regexp"
+
+#: src/search.c:632
+msgid "The -P and -z options cannot be combined"
+msgstr "Voľby -P a -z nie je možné kombinovať"
+
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Voľba -P podporuje iba jedinú vzorku"
+
+#: lib/error.c:117
+msgid "Unknown system error"
+msgstr "Neznáma systémová chyba"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: voľba „%s“ je nejednoznačná\n"
+
+#: lib/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: voľba „--%s“ nepripúšťa argument\n"
+
+#: lib/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: voľba „%c%s“ nepripúšťa argument\n"
+
+#: lib/getopt.c:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: voľba „%s“ vyžaduje argument\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nerozpoznaná voľba „--%s“\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nerozpoznaná voľba „%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: neprípustná voľba -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: neplatná voľba -- %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: voľba voľba vyžaduje argument -- %c\n"
+
+#: lib/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: voľba „-W %s“ je nejednoznačná\n"
+
+#: lib/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: voľba „-W %s“ nepripúšťa argument\n"
+
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'". If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK). A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#: lib/quotearg.c:259
+msgid "`"
+msgstr "„"
+
+#: lib/quotearg.c:260
+msgid "'"
+msgstr "“"
diff --git a/po/sl.po b/po/sl.po
index 31998f43..70acd5db 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,141 +1,154 @@
-# -*- mode: po; coding: iso-latin-2 -*- Slovenian message catalogue for grep
-# Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
-# Primo Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 1996, 1999, 2000.
+# -*- 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.
#
-# $Id: sl.po,v 1.31 2006/08/18 21:04:18 bero Exp $
+# $Id: sl.po,v 1.32 2007/11/03 04:02:56 taa Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2002-03-11 09:25+0100\n"
-"Last-Translator: Primo Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
+"Project-Id-Version: GNU grep 2.5.3\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"
+"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"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"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:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
msgstr "Pomnilnik porabljen"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c: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
msgid "Unbalanced ["
msgstr "Oklepaj [ brez zaklepaja"
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
-msgstr "Nedokonano ubeno zaporedje \\"
+msgstr "Nedokončano ubežno zaporedje \\"
#. 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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
-msgstr "nedokonano tevilo ponovitev"
+msgstr "nedokončano število ponovitev"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
-msgstr "slabo doloeno tevilo ponovitev"
+msgstr "slabo določeno število ponovitev"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
-msgstr "Oklepaj ( brez zaklepaja"
+msgstr "Uklepaj ( brez zaklepaja"
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
msgstr "Skladnja ni podana"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
-msgstr "Zaklepaj ) brez oklepaja"
+msgstr "Zaklepaj ) brez uklepaja"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "zmanjkalo pomnilnika"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
msgstr "pomnilnik porabljen"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "velikost konteksta ni veljavna"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "vhod je prevelik, da bi ga mogli preteti"
+msgstr "vhod je prevelik, da bi ga mogli prešteti"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
msgstr "pisanje rezultatov"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
msgstr "Binarna datoteka %s ustreza\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(standardni vhod)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "pozor: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "rekurzivna zanka imenikov"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Poskusite ,%s --help` za dodatna pojasnila.\n"
-#: src/grep.c:1053
+#: 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 "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA] ...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "VZOREC je privzeto osnovni regularni izraz (ORI).\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 ""
-"V DATOTEKI ali na standardnem vhodu iemo VZOREC.\n"
-"Primer: %s -i 'hello.*world' menu.h main.c\n"
+"Zgled: %s -i 'hello world' menu.h main.c\n"
"\n"
-"Izbira in tolmaenje regularnih izrazov:\n"
+"Izbira in tolmačenje regularnih izrazov:\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 VZOREC je razirjeni regularni izraz\n"
-" -F, --fixed-strings VZOREC je mnoica nizov, vsak v svoji vrstici\n"
-" -G, --basic-regexp VZOREC je osnovni regularni izraz\n"
-" -P, --perl-regexp VZOREC je regularni izraz z raziritvami perla\n"
+" -E, --extended-regexp VZOREC je razširjeni regularni izraz (RRI)\n"
+" -F, --fixed-strings VZOREC je množica nizov, vsak v svoji vrstici\n"
+" -G, --basic-regexp VZOREC je osnovni regularni izraz (ORI)\n"
+" -P, --perl-regexp VZOREC je regularni izraz z razširitvami perla\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"
@@ -144,13 +157,14 @@ msgid ""
msgstr ""
" -e, --regexp=VZOREC uporabimo VZOREC kot regularni izraz\n"
" -f, --file=DATOTEKA VZOREC preberemo s podane DATOTEKE\n"
-" -i, --ignore-case ne razlikujemo med velikimi in malimi rkami\n"
-" -w, --word-regexp iskanje uspeno le, e je VZOREC cela beseda\n"
-" -x, --line-regexp iskanje uspeno le, e je VZOREC cela vrstica\n"
-" -z, --null-data vrstica podatkov je konana z znakom NUL, ne z\n"
+" -i, --ignore-case ne razlikujemo med velikimi in malimi črkami\n"
+" -w, --word-regexp iskanje uspešno le, če je VZOREC cela beseda\n"
+" -x, --line-regexp iskanje uspešno le, če je VZOREC cela vrstica\n"
+" -z, --null-data vrstica podatkov je končana z znakom NUL, ne z\n"
" znakom za skok v novo vrstico\n"
-#: src/grep.c:1071
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -162,13 +176,14 @@ msgid ""
msgstr ""
"\n"
"Razno:\n"
-" -s, --no-messages brez sporoil o napakah\n"
+" -s, --no-messages brez sporočil o napakah\n"
" -v, --invert-match komplement: vrstice, kjer ni VZORCA\n"
" -V, --version verzija programa\n"
-" --help ta pomo\n"
-" --mmap e je mono, uporabi pomnilniko preslikan vhod\n"
+" --help ta pomoč\n"
+" --mmap če je možno, uporabi pomnilniško preslikan vhod\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -181,34 +196,36 @@ 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"
"Nadzor izhoda:\n"
-" -m, --max-count=TEVILO odnehamo, ko je doseeno TEVILO ujemanj\n"
+" -m, --max-count=ŠTEVILO odnehamo, ko je doseženo ŠTEVILO ujemanj\n"
" -b, --byte-offset z izpisom odmika (v zlogih)\n"
-" -n, --line-number z izpisom zaporedne tevilke vrstice\n"
+" -n, --line-number z izpisom zaporedne številke vrstice\n"
" --line-buffered izhodni medpomnilnik izpraznimo vsako vrstico\n"
" -H, --with-filename z izpisom imena datoteke\n"
" -h, --no-filename brez izpisa imena datoteke\n"
" --label=OZNAKA z navedeno OZNAKO, kadar beremo s standardnega vhoda\n"
" -o, --only-matching izpis samo dela vrstice z VZORCEM\n"
-" -q, --quiet, --silent brez vsega obiajnega izpisa\n"
+" -q, --quiet, --silent brez vsega običajnega izpisa\n"
" --binary-type=TIP privzemi izbrani TIP binarne datoteke\n"
" TIP je lahko ,binary`, ,text` ali ,without-match`\n"
" -a, --text isto kot --binary-type=text\n"
@@ -218,16 +235,19 @@ msgstr ""
" -D, --devices=DEJANJE kako obravnavamo datoteke naprav\n"
" DEJANJE je lahko ,read` ali ,skip`\n"
" -R, -r, --recursive isto kot --directories=recurse\n"
-" --include=VZOREC preiemo le datoteke, ki ustrezajo VZORCU\n"
+" --include=VZOREC preiščemo le datoteke, ki ustrezajo VZORCU\n"
" --exclude=VZOREC izpustimo datoteke, ki ustrezajo VZORCU\n"
" --exclude-from=DATOTEKA izpustimo datoteke, ki ustrezajo vzorcu v DATOTEKI\n"
-" -L, --files-without-match le imena tistih DATOTEK, kjer VZORCA nismo nali\n"
-" -l, --files-with-matches le imena tistih DATOTEK, kjer smo VZOREC nali\n"
-" -c, --count le skupno tevilo vrstic v DATOTEKI, v katerih se\n"
+" --exclude-dir=VZOREC izpustimo imenike, ki ustrezajo VZORCU\n"
+" -L, --files-without-match le imena tistih DATOTEK, kjer VZORCA nismo našli\n"
+" -l, --files-with-matches le imena tistih DATOTEK, kjer smo VZOREC našli\n"
+" -c, --count le skupno število vrstic v DATOTEKI, v katerih se\n"
" pojavi VZOREC\n"
-" -Z, --null izpii znak NUL za imenom DATOTEKE\n"
+" -T, --initial-tab dodaj začetni tabulator (če je potrebno)\n"
+" -Z, --null izpiši znak NUL za imenom DATOTEKE\n"
-#: src/grep.c:1107
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -236,90 +256,136 @@ 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"
"Nadzor nad kontekstom:\n"
-" -B, --before-context=T T vrstic konteksta pred vrstico z VZORCEM\n"
-" -A, --after-context=T T vrstic konteksta za vrstico z VZORCEM\n"
-" -C, --context[=T] T vrstic konteksta pred in za vrstico z VZORCEM\n"
-" -T isto kot --context=T\n"
-" --color, --colour ujemajoe nize barvno oznaimo\n"
-" -U, --binary ne poreemo znakov CR na koncu vrstic (MS-DOS)\n"
-" -u, --unix-byte-offsets v odmikih ne tejemo znakov CR (MS-DOS)\n"
+" -B, --before-context=ŠT ŠT vrstic konteksta pred vrstico z VZORCEM\n"
+" -A, --after-context=ŠT ŠT vrstic konteksta za vrstico z VZORCEM\n"
+" -C, --context[=ŠT] ŠT vrstic konteksta pred in za vrstico z VZORCEM\n"
+" -ŠT isto kot --context=ŠT\n"
+" --color[=KDAJ],\n"
+" --colour[=KDAJ] ujemajoče nize barvno označimo; KDAJ je lahko\n"
+" »always«, »never« ali »auto«\n"
+" -U, --binary ne porežemo znakov CR na koncu vrstic (MS-DOS)\n"
+" -u, --unix-byte-offsets v odmikih ne štejemo znakov CR (MS-DOS)\n"
"\n"
-"Ukaz ,egrep` pomeni isto kot ,grep -E`, ,fgrep` pa isto kot ,grep -F`.\n"
-"e DATOTEKA ni podana ali pa je -, beremo s standardnega vhoda. e sta podani\n"
-"manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je ni, e smo VZOREC\n"
-"nali, ena, e ga nismo, 2 pa pomeni skladenjsko ali sistemsko napako.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: 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"
+msgstr ""
+"Ukaz »egrep« pomeni isto kot »grep -E«, »fgrep« pa isto kot »grep -F«.\n"
+"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"
+"if any error occurs and -q was not given, the exit status is 2.\n"
+msgstr ""
+"Če DATOTEKA ni podana ali pa je »-«, beremo s standardnega vhoda. Če sta podani\n"
+"manj kot dve DATOTEKI, privzamemo izbiro -h. Izhodna koda je 0 ob vsaj eni\n"
+"vrstici zadetka, sicer pa 1; če ni bila podana izbira -q, program ob napaki\n"
+"vrne kodo 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"
-"Morebitne napake v programu sporoite na <bug-gnu-utils@gnu.org>.\n"
+"Napake v programu javite na <%s>.\n"
-# Sporoilo se pojavi pri nedokumentirani izbiri -X
+# Sporočilo se pojavi pri nedokumentirani izbiri -X
# grep.c:622 ->
# opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"
# grep --help ->
# usage: grep [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "podana navodila si nasprotujejo"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "Ignorirano: v GREP_COLORS=\"%s\" mora \"%s\" vsebovati vrednost (\"=...\")."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "Ignorirano: v GREP_COLORS=\"%s\" je \"%s\" Boolova spremenljivka in ji ne moremo določiti vrednosti (\"=%s\")."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "V GREP_COLORS=\"%s\", \"%s\" vsebuje %s."
+
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Prekinjena obdelava slabo formuliranega določila GREP_COLORS=\"%s\" pri preostalem podnizu \"%s\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
msgstr "neznana metoda datotek naprav"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
msgstr "neznana metoda imenikov"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
-msgstr "neveljavno najveje tevilo"
+msgstr "neveljavno največje število"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
msgstr "neznan tip binarne datoteke"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+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:1662
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Copyright (C) 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-
-#: src/grep.c:1664
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"To je prost program; pogoji, pod katerimi ga lahko uporabljate, razmnoujete\n"
-"in razirjate so navedeni v izvorni kodi. Za program ni NOBENEGA jamstva,\n"
+"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"
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Izbira -P ni podprta"
-
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Podpora za izbiro -P ni bila vključena v ta prevedeni program (--disable-perl-regexp)"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "Izbiri -P in -z se med seboj izkljuujeta"
+msgstr "Izbiri -P in -z se med seboj izključujeta"
+
+#: src/search.c:634
+msgid "The -P option only supports a single pattern"
+msgstr "Izbira -P podpira le en vzorec"
#: lib/error.c:117
msgid "Unknown system error"
@@ -406,6 +472,15 @@ msgstr ","
msgid "'"
msgstr "`"
+#~ msgid "out of memory"
+#~ msgstr "zmanjkalo pomnilnika"
+
+#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+#~ msgstr "Uporaba: %s [IZBIRA]... VZOREC [DATOTEKA] ...\n"
+
+#~ msgid "%s (GNU grep) %s\n"
+#~ msgstr "%s (GNU grep) %s\n"
+
#~ msgid "option %s"
#~ msgstr "izbira %s"
@@ -413,7 +488,7 @@ msgstr "`"
#~ msgstr " z argumentom %s"
#~ msgid "digits occur in two different argv-elements.\n"
-#~ msgstr "tevke nastopajo pri dveh elementih ARGV.\n"
+#~ msgstr "števke nastopajo pri dveh elementih ARGV.\n"
#~ msgid "option %c\n"
#~ msgstr "izbira %c\n"
diff --git a/po/sr.po b/po/sr.po
index eaef83dc..a56bd2cb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2003-11-29 01:00+0100\n"
"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
"Language-Team: Serbian <sr@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Неуравнотежена )"
msgid "out of memory"
msgstr "понестало меморије"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "меморија истрошена"
@@ -66,49 +66,49 @@ msgstr "меморија истрошена"
msgid "invalid context length argument"
msgstr "неисправан аргумент дужине контекста"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "улаз је превелик за пребројавање"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "пишем излаз"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Бинарна датотека %s одговара\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(стандардни улаз)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "упозорење: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "рекурзивно вртење кроз директоријуме"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Употреба: %s [ОПЦИЈА]... ШАБЛОН [ДАТОТЕКА]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Пробајте „%s --help“ за више података.\n"
# bug: is this "..."<>" ..." difference neccessary?
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Употреба: %s [ОПЦИЈА]... ШАБЛОН [ДАТОТЕКА] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"Избор и обрада регуларних израза:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,7 +133,7 @@ msgstr ""
" -G, --basic-regexp ШАБЛОН је основни регуларни израз\n"
" -P, --perl-regexp ШАБЛОН је Перл регуларни израз\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -149,7 +149,7 @@ msgstr ""
" -x, --line-regexp присили ШАБЛОН да одговара једино целим редовима\n"
" -z, --null-data ред података се завршава 0-бајтом, не новим редом\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -167,7 +167,7 @@ msgstr ""
" --help прикажи ову помоћ и заврши\n"
" --mmap мапирај улаз у меморију ако је могуће\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -226,7 +226,7 @@ msgstr ""
" -c, --count испиши само број поклапања редова по датотеци\n"
" -Z, --null испиши 0-бајт након имена датотеке\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -262,45 +262,44 @@ msgstr ""
"дато мање од две датотеке, претпостављам -h. Излазно стање је 0 ако се \n"
"поклапа, 1 ако се не поклапа и 2 ако има проблема.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"Пријавите грешке на <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "наведени су сударајући трагачи"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "непознат метод уређаја"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "непознат метод директоријума"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "неисправан максимални број"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "непозната врста бинарних датотека"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (ГНУ греп) %s\n"
-#: src/grep.c:1662
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "Сва права задржана 1988, 1992-1999, 2000, 2001 Задужбина за слободни софтвер.\n"
-#: src/grep.c:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/sv.po b/po/sv.po
index f2db3f64..2b1c487e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,31 +1,33 @@
-# Swedish messages for GNU Grep version 2.5e
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Daniel Resare <daniel@resare.com>, 1998, 1999, 2000, 2001, 2002
+# Swedish messages for GNU Grep version 2.5.3
+# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
# Thomas Olsson <cid95tho@student1.lu.se>, 1996.
+# Daniel Resare <daniel@resare.com>, 1998, 1999, 2000, 2001
+# Daniel Nylander <po@danielnylander.se>, 2006, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU grep 2.5.1\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2002-05-12 18:39+0200\n"
-"Last-Translator: Daniel Resare <daniel@resare.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Project-Id-Version: grep 2.5.3\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"
+"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=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
-msgstr "Minnet slut"
+msgstr "Minnet är slut"
-#: src/dfa.c:489 src/dfa.c:492 src/dfa.c:510 src/dfa.c:521 src/dfa.c:545
-#: src/dfa.c:604 src/dfa.c:609 src/dfa.c:622 src/dfa.c:623 src/dfa.c:1001
-#: src/dfa.c:1004 src/dfa.c:1028 src/dfa.c:1032 src/dfa.c:1033 src/dfa.c:1036
-#: src/dfa.c:1048 src/dfa.c:1049
+#: src/dfa.c: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
msgid "Unbalanced ["
msgstr "Obalanserad ["
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
msgstr "Oavslutad \\-sekvens"
@@ -33,123 +35,134 @@ msgstr "Oavslutad \\-sekvens"
#. {M} - exact count
#. {M,} - minimum count, maximum is infinity
#. {M,N} - M through N
-#: src/dfa.c:874 src/dfa.c:880 src/dfa.c:890 src/dfa.c:898 src/dfa.c:913
+#: src/dfa.c:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
-msgstr "oavslutad repetitionsrknare"
+msgstr "oavslutad repetitionsräknare"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
-msgstr "felformaterad repetionsrknare"
+msgstr "felformaterad repetionsräknare"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
msgstr "Obalanserad ("
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
msgstr "Ingen specificerad syntax"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
msgstr "Obalanserad )"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "minnet slut"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
-msgstr "minnet slut"
+msgstr "minnet är slut"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "ogiltigt argument till -A, -B eller -C"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
-msgstr "det r fr mycket indata fr att rkna"
+msgstr "det är för mycket indata för att räkna"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
msgstr "skriver utdata"
-#: src/grep.c:878
+#: src/grep.c:1209
#, c-format
msgid "Binary file %s matches\n"
-msgstr "Binr fil %s matchar\n"
+msgstr "Binär fil %s matchar\n"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
msgstr "(standard in)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
msgstr "varning: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "rekursiv katalogloop"
-#: src/grep.c:1046
+#: src/grep.c:1404 src/grep.c:1411
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
-msgstr "Anvndning: %s [FLAGGA]... MNSTER [FIL]...\n"
+msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Frsk med \"%s --help\" fr mer information\n"
+msgstr "Försök med \"%s --help\" för mer information\n"
+
+#: src/grep.c:1412
+#, c-format
+msgid "Search for PATTERN in each FILE or standard input.\n"
+msgstr "Sök efter MÖNSTER i varje FIL eller standard in.\n"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "MÖNSTER är ett utökat reguljärt uttryck (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "MÖNSTER är en uppsättning nyradsseparerade fasta strängar.\n"
-#: src/grep.c:1053
+#: src/grep.c:1421
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Anvndning: %s [FLAGGA]... MNSTER [FIL]...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "MÖNSTER är, som standard, ett enkelt reguljärt uttryck (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 ""
-"Sk efter MNSTER i varje FIL eller standard in.\n"
-"Exempel: %s -i 'hello world' menu.h main.c\n"
+"Exempel: %s -i \"hello world\" menu.h main.c\n"
"\n"
-"Val och tolkning av reguljra uttryck:\n"
+"Val och tolkning av reguljära uttryck:\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 MNSTER r ett utkat reguljrt uttryck\n"
-" -F, --fixed-strings MNSTER r ett antal strngar separerade med nyrad\n"
-" -G, --basic-regexp MNSTER r ett enkelt reguljrt uttryck\n"
-" -P, --perl-regexp MNSTER r ett reguljrt uttryck som i Perl\n"
+" -E, --extended-regexp MÖNSTER är ett utökat reguljärt uttryck (ERE)\n"
+" -F, --fixed-strings MÖNSTER är ett antal strängar separerade med nyrad\n"
+" -G, --basic-regexp MÖNSTER är ett enkelt reguljärt uttryck (BRE)\n"
+" -P, --perl-regexp MÖNSTER är ett reguljärt uttryck som i 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=MNSTER anvnd MNSTER som ett reguljrt uttryck\n"
-" -f, --file=FIL hmta MNSTER frn FIL\n"
-" -i, --ignore-case skilj ej p gemener och versaler\n"
-" -w, --word-regexp tvinga MNSTER att endast matcha hela ord\n"
-" -x, --line-regexp tvinga MNSTER att endast matcha hela rader\n"
-" -z, --null-data en rad indata begrnsas av en nolltecken, inte\n"
-" av ett nyrad-tecken\n"
-
-#: src/grep.c:1071
+" -e, --regexp=MÖNSTER använd MÖNSTER som ett reguljärt uttryck\n"
+" -f, --file=FIL hämta MÖNSTER från FIL\n"
+" -i, --ignore-case skilj ej på gemener och versaler\n"
+" -w, --word-regexp tvinga MÖNSTER att endast matcha hela ord\n"
+" -x, --line-regexp tvinga MÖNSTER att endast matcha hela rader\n"
+" -z, --null-data en datarad slutar i 0 byte, inte nyradstecken\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -162,13 +175,14 @@ msgstr ""
"\n"
"Diverse:\n"
" -s, --no-messages visa inga felmeddelanden\n"
-" -v, --invert-match vlj rader utan trffar\n"
+" -v, --invert-match välj rader utan träffar\n"
" -V, --version visa versionsinformation och avsluta\n"
-" --help visa detta hjlpmeddelande och avsluta\n"
-" --mmap anvnd om mjligt minesmappning vid\n"
-" lsning av indata.\n"
+" --help visa detta hjälpmeddelande och avsluta\n"
+" --mmap använd om möjligt minesmappning vid\n"
+" läsning av indata.\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -181,51 +195,57 @@ 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"
"Styrning av utskrift:\n"
-" -m, --max-count=ANT skriv bara ut ANT trffar\n"
+" -m, --max-count=NUM skriv bara ut NUM träffar\n"
" -b, --byte-offset skriv position med visade rader\n"
" -n, --line-number skriv radnummer med visade rader\n"
-" --line-buffered tm utskriftsbuffer efter varje rad\n"
-" -H, --with-filename skriv filnamn vid varje trff\n"
+" --line-buffered töm utskriftsbuffer efter varje rad\n"
+" -H, --with-filename skriv filnamn vid varje träff\n"
" -h, --no-filename skriv inte filnamn vid varje visad rad\n"
-" --label=ETIKETT skriv ETIKETT som filnamn fr standard in\n"
+" --label=ETIKETT skriv ut ETIKETT som filnamn för standard in\n"
+" -o, --only-matching visa endast delen av en rad som matchar MÖNSTER\n"
" -q, --quiet, --silent undvik all normal utskrift\n"
-" --binary-files=TYP antag att binra filer r av TYP\n"
-" TYP r \"binary\", \"text\" eller \"without-match\"\n"
+" --binary-files=TYP antag att binära filer är av TYP\n"
+" TYP är \"binary\", \"text\" eller \"without-match\"\n"
" -a, --text motsvarar --binary-files=text\n"
" -I motsvarar --binary-files=without-match\n"
-" -d, --directories=TGRD hur kataloger skall hanteras\n"
-" TGRD r \"read\", \"recurse\" eller \"skip\".\n"
-" -D, --devices=TGRD hur enheter, rr och sockets skall hanteras\n"
-" TGRD r \"read\" eller \"skip\"\n"
+" -d, --directories=ÅTGÄRD hur kataloger skall hanteras\n"
+" ÅTGÄRD är \"read\", \"recurse\" eller \"skip\".\n"
+" -D, --devices=ÅTGÄRD hur enheter hanteras, FIFO:er och uttag\n"
+" ÅTGÄRD är \"read\" eller \"skip\"\n"
" -R, -r, --recursive motsvarar --directories=recurse\n"
-" --include=MNSTER filer som matchar MNSTER undersks\n"
-" --exclude=MNSTER filer som matchar MNSTER hoppas ver\n"
-" --exclude-from=FIL filer som matchar mnster i FIL hoppas ver\n"
-" -L, --files-without-match skriv bara ut FILnamn utan trffar\n"
-" -l, --files-with-matches skriv bara ut FILnamn med trffar\n"
-" -c, --count skriv fr varje FIL bara ut antal trffade rader\n"
+" --include=MÖNSTER filer som matchar MÖNSTER undersöks\n"
+" --exclude=MÖNSTER filer som matchar MÖNSTER hoppas över\n"
+" --exclude-from=FIL filer som matchar mönster i FIL hoppas över\n"
+" --exclude-dir=MÖNSTER kataloger som matchar MÖNSTER hoppas över.\n"
+" -L, --files-without-match skriv bara ut FILnamn utan träffar\n"
+" -l, --files-with-matches skriv bara ut FILnamn med träffar\n"
+" -c, --count skriv för varje FIL bara ut antal träffade rader\n"
+" -T, --initial-tab gör så tabulatorer radar upp (om det behövs)\n"
" -Z, --null skriv 0-byte efter FILnamn\n"
-#: src/grep.c:1107
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -234,95 +254,140 @@ 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"
"Kontroll av sammanhang:\n"
-" -B, --before-context=ANTAL skriv ANTAL rader fre trffad rad\n"
-" -A, --after-context=ANTAL skriv ANTAL rader efter trffad rad\n"
-" -C, --context=ANTAL skriv ANTAL rader runt trffad rad\n"
+" -B, --before-context=ANTAL skriv ANTAL rader före träffad rad\n"
+" -A, --after-context=ANTAL skriv ANTAL rader efter träffad rad\n"
+" -C, --context=ANTAL skriv ANTAL rader runt träffad rad\n"
" -ANTAL motsvarar --context=ANTAL\n"
-" --color, --colour anvnd markrer fr att srskilja trff\n"
+" --color[=NÄR],\n"
+" --colour[=NÄR] använd markörer för att särskilja träff\n"
+" NÄR kan vara \"always\", \"never\" eller \"auto\".\n"
" -U, --binary ta inte bort CR-tecken vid radslut (MSDOS)\n"
-" -u, --unix-byte-offsets skriv offset som om CR-tecken inte frekommit\n"
+" -u, --unix-byte-offsets skriv offset som om CR-tecken inte förekommit\n"
"\n"
-"\"egrep\" betyder \"grep -E\". \"fgrep\" betyder \"grep -F\".\n"
-"Utan FIL, eller om FIL r -, lser programmet frn standard in. Om frre n\n"
-"tv FILer r angivna, stts flaggan -h. Programmet returnerar 0 om ngot\n"
-"matchar, 1 om inget matchade och 2 om ngot fel uppsttt.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1495
+#, c-format
+msgid "Invocation as `egrep' is deprecated; use `grep -E' instead.\n"
+msgstr "Körning som \"egrep\" är föråldrat; använd \"grep -E\" istället.\n"
+
+#: src/grep.c:1498
+#, c-format
+msgid "Invocation as `fgrep' is deprecated; use `grep -F' instead.\n"
+msgstr "Körning som \"fgrep\" är föråldrat; använd \"grep -F\" istället.\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\" betyder \"grep -E\". \"fgrep\" betyder \"grep -F\".\n"
+"Direktanrop som antingen \"egrep\" eller \"fgrep\" är föråldrat.\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 ""
+"Utan någon FIL eller när FIL är -, läs från standard in. Om mindre än två FILer\n"
+"anges, anta -h. Avslutningsstatus är 0 om någon rad valdes, annars 1;\n"
+"om något fel inträffar och -q inte angavs, är avslutningsstatusen 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"
-"Rapportera buggar till <bug-gnu-utils@gnu.org>.\n"
-"Skicka anmrkningar p versttningar till <sv@li.org>\n"
+"Rapportera fel till <%s>.\n"
+"Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
-msgstr "motstridiga skstrngar specificerade"
+msgstr "motstridiga söksträngar specificerade"
+
+#: src/grep.c:1715
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped."
+msgstr "I GREP_COLORS=\"%s\", \"%s\"-kapaciteten behöver ett värde (\"=...\"); hoppades över."
+
+#: src/grep.c:1719
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped."
+msgstr "I GREP_COLORS=\"%s\", \"%s\"-kapaciteten är boolesk och kan inte ta ett värde (\"=%s\"); hoppades över."
+
+#: src/grep.c:1727
+#, c-format
+msgid "In GREP_COLORS=\"%s\", the \"%s\" capacity %s."
+msgstr "I GREP_COLORS=\"%s\", \"%s\"-kapaciteten %s."
-#: src/grep.c:1376
+#: src/grep.c:1750
+#, c-format
+msgid "Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\"."
+msgstr "Stoppade behandling av felformulerad GREP_COLORS=\"%s\" på återstående understrängen \"%s\"."
+
+#: src/grep.c:1883
msgid "unknown devices method"
-msgstr "oknd metod gllande enheter"
+msgstr "metod för okända enheter"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
-msgstr "oknd metod gllande kataloger"
+msgstr "okänd metod gällande kataloger"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
-msgstr "ogiltigt vrde fr antal trffar"
+msgstr "ogiltigt värde för antal träffar"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
-msgstr "oknd binrfiltyp"
+msgstr "okänd binärfiltyp"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (GNU grep) %s\n"
+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: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
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"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 ""
-"Detta program r fri programvara, se kllkoden fr kopieringsvilkor. Det\n"
-"finns INGEN garanti, inte ens fr SLJBARHET eller LMPLIGHET FR NGOT\n"
-"SPECIELLT NDAML.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Flaggan -P stds inte"
+"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"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Stöd för flaggan -P är inte inbyggd i den här binären med --disable-perl-regexp"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
msgstr "Flaggorna -P och -z kan inte kombineras"
+#: src/search.c:634
+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
msgid "Unknown system error"
-msgstr "Oknt systemfel"
+msgstr "Okänt systemfel"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flaggan \"%s\" r tvetydig\n"
+msgstr "%s: flaggan \"%s\" är tvetydig\n"
#: lib/getopt.c:700
#, c-format
@@ -337,50 +402,50 @@ msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flaggan \"%s\" behver ett argument\n"
+msgstr "%s: flaggan \"%s\" behöver ett argument\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: oknd flagga \"--%s\"\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: oknd flagga \"%c%s\"\n"
+msgstr "%s: okänd flagga \"%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: otillten flagga -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: otillten flagga -- %c\n"
+msgstr "%s: otillåten flagga -- %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: flagga behver ett argument -- %c\n"
+msgstr "%s: flagga behöver ett argument -- %c\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" r tvetydig\n"
+msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"-W %s\" tillter inget argument\n"
+msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
-# D det skulle krvas att spara hela filen i UTF-8 fr att kunna gra
-# detta rtt, knns det inte vrt det. Speciellt eftersom funktionen
-# inte anvnds i grep
+# Då det skulle krävas att spara hela filen i UTF-8 för att kunna göra
+# detta rätt, känns det inte värt det. Speciellt eftersom funktionen
+# inte används i grep
#
#. Get translations for open and closing quotation marks.
#.
@@ -403,3 +468,12 @@ msgstr "\""
#: lib/quotearg.c:260
msgid "'"
msgstr "\""
+
+#~ msgid "out of memory"
+#~ msgstr "minnet slut"
+
+#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+#~ msgstr "Användning: %s [FLAGGA]... MÖNSTER [FIL]...\n"
+
+#~ msgid "%s (GNU grep) %s\n"
+#~ msgstr "%s (GNU grep) %s\n"
diff --git a/po/uk.po b/po/uk.po
index 0248e7c1..3d84a349 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2,12 +2,12 @@
# 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.1 2006/08/18 21:04:18 bero Exp $
+# $Id: uk.po,v 1.2 2007/11/03 04:02:56 taa Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2003-01-25 13:27+0200\n"
"Last-Translator: Volodymyr M. Lisivka <lvm@mystery.lviv.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -58,8 +58,8 @@ msgstr " )"
msgid "out of memory"
msgstr " 'Ԧ"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "' "
@@ -67,48 +67,48 @@ msgstr "' "
msgid "invalid context length argument"
msgstr " "
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "צ "
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr " צ"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "צ %s ͦ ¦Φ\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "( צ)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr ": %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr " Ǧ"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr ": %s []... []...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr " \"%s --help\" ϧ æ.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr ": %s []... [] ...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -121,7 +121,7 @@ msgstr ""
"\n"
"¦ æ ڦ:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -133,7 +133,7 @@ msgstr ""
" -G, --basic-regexp \n"
" -P, --perl-regexp Perl\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -150,7 +150,7 @@ msgstr ""
" -z, --null-data ˦ \"0\", ˦\n"
" \n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -168,7 +168,7 @@ msgstr ""
" --help Ц \n"
" --mmap mmap(2) , \n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -229,7 +229,7 @@ msgstr ""
" ڦ ¦ \n"
" -Z, --null \"0\" Ц Φ \n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -267,45 +267,44 @@ msgstr ""
" , Φ , -h. 0 -\n"
" ¦Ԧ, 1 - , 2 - ڦ .\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"צ <bug-gnu-utils@gnu.org>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "Φ ¦Ԧ ̦"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr ""
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr ""
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr " ˦˦"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "צ צ ̦"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr ""
-#: src/grep.c:1662
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr ""
-#: src/grep.c:1664
+#: src/grep.c:1650
msgid ""
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/po/vi.po b/po/vi.po
index 020daa8a..c37f7b39 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,154 +1,170 @@
-# Vietnamese Translation for grep-2.5.1a.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Vietnamese Translation for Grep.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: grep 2.5.1a\n"
-"Report-Msgid-Bugs-To: bug-grep@gnu.org\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
-"PO-Revision-Date: 2005-03-04 14:07+1000\n"
+"Project-Id-Version: grep 2.5.3\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"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net> \n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
"MIME-Version: 1.0\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"
-#: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
+#: src/dfa.c:183 src/dfa.c:194 src/dfa.c:205 src/search.c:704
msgid "Memory exhausted"
-msgstr "Hết bộ nhó"
+msgstr "Hết bộ nhó hoàn toàn"
-#: 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: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
msgid "Unbalanced ["
-msgstr "Chưa cân bằng ["
+msgstr "Dấu ngoặc vuông mở [ riêng"
-#: src/dfa.c:741
+#: src/dfa.c:788
msgid "Unfinished \\ escape"
-msgstr "\\ escape chưa xong"
+msgstr "Chưa kết thúc dãy thoát \\"
#. 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:921 src/dfa.c:927 src/dfa.c:937 src/dfa.c:945 src/dfa.c:960
msgid "unfinished repeat count"
-msgstr "việc đếm lần nữa chưa xong"
+msgstr "chưa kết thúc sự đếm lặp lại"
-#: src/dfa.c:887 src/dfa.c:904 src/dfa.c:912 src/dfa.c:916
+#: src/dfa.c:934 src/dfa.c:951 src/dfa.c:959 src/dfa.c:963
msgid "malformed repeat count"
-msgstr "việc đếm lần nữa khuyết tật"
+msgstr "sự đếm lặp lại dạng sai"
-#: src/dfa.c:1253
+#: src/dfa.c:1305
msgid "Unbalanced ("
-msgstr "Chưa cân bằng ("
+msgstr "Dấu ngoặc mở ( riêng"
-#: src/dfa.c:1378
+#: src/dfa.c:1430
msgid "No syntax specified"
-msgstr "Chưa ghi rõ cú pháp nào"
+msgstr "Chưa ghi rõ cú pháp"
-#: src/dfa.c:1386
+#: src/dfa.c:1438
msgid "Unbalanced )"
-msgstr "Chưa cân bằng )"
+msgstr "Dấu ngoặc đóng ) riêng"
-#: src/dfa.c:2956
-msgid "out of memory"
-msgstr "hết bộ nhớ"
-
-#: src/kwset.c:171 src/kwset.c:177 src/search.c:103 src/search.c:209
-#: src/search.c:293 lib/obstack.c:471
+#: src/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
msgid "memory exhausted"
-msgstr "hết bộ nhớ rồi"
+msgstr "hết bộ nhớ hoàn toàn"
-#: src/grep.c:205
+#: src/grep.c:404
msgid "invalid context length argument"
msgstr "đối số độ dài ngữ cảnh không hợp lệ"
-#: src/grep.c:479
+#: src/grep.c:665
msgid "input is too large to count"
msgstr "dữ liệu nhập quá lớn để đếm được"
-#: src/grep.c:605
+#: src/grep.c:927
msgid "writing output"
-msgstr "đang ghi dữ liệu xuất"
+msgstr "đang ghi kết xuất"
-#: src/grep.c:878
+#: 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"
-#: src/grep.c:892
+#: src/grep.c:1223
msgid "(standard input)"
-msgstr "(dữ liệu nhập chuẩn)"
+msgstr "(thiết bị nhập chuẩn)"
-#: src/grep.c:997
+#: src/grep.c:1355
#, c-format
msgid "warning: %s: %s\n"
-msgstr "cảnh báo: %s %s\n"
+msgstr "cảnh báo : %s %s\n"
-#: src/grep.c:998
+#: src/grep.c:1356
msgid "recursive directory loop"
msgstr "vòng lặp thư mục đệ qui"
-#: src/grep.c:1046
+#: 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ÙYCHỌN]... MẪU [TẬPTIN]...\n"
+msgstr "Cách sử dụng: %s [TÙY_CHỌN]... MẪU [TẬP_TIN]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1406
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "Hãy thử lệnh `%s --help' để xem thông tin thêm.\n"
+msgstr "Hãy thử lệnh trợ giúp « %s --help » để xem thêm thông tin.\n"
+
+#: 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"
+
+#: src/grep.c:1415
+#, c-format
+msgid "PATTERN is an extended regular expression (ERE).\n"
+msgstr "MẪU là một biểu thức chính quy đã mở rộng (ERE).\n"
+
+#: src/grep.c:1418
+#, c-format
+msgid "PATTERN is a set of newline-separated fixed strings.\n"
+msgstr "MẪU là một tập hợp các chuỗi cố định phân cách bằng ký tự dòng mới.\n"
-#: src/grep.c:1053
+#: src/grep.c:1421
#, c-format
-msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
-msgstr "Cách sử dụng: %s [TÙYCHỌN]... MẪU [TẬPTIN]...\n"
+msgid "PATTERN is, by default, a basic regular expression (BRE).\n"
+msgstr "MẪU, theo mặc định, là một biểu thức chính quy cơ bản (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 ""
-"Tìm kiếm MẪU trong mỗi TẬP TIN hay dữ liệu nhập chuẩn.\n"
-"Thí dụ: %s -i 'hello world' menu.h main.c\n"
+"Thí dụ : %s -i 'chào thế giới' menu.h main.c\n"
"\n"
-"Cách chọn và giải thích biểu thức chính quy (regex/regexp):\n"
+"Chọn và giải thích biểu thức chính quy:\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 MẪU là một _biểu thức chính quy mở rộng_\n"
-" -F, --fixed-strings MẪU là một bộ _chuỗi_ ngăn cách bằng dòng mới (_cố định_)\n"
-" -G, --basic-regexp MẪU là một _biểu thức chính quy cơ bản_\n"
-" -P, --perl-regexp MẪU là một _biểu thức chính quy Perl_\n"
+" -E, --extended-regexp MẪU là một biểu thức chính quy đã mở rộng (ERE)\n"
+" -F, --fixed-strings MẪU là một tập hợp các chuỗi cố định phân cách\n"
+"\t\t\t\t\t\tbằng ký tự dòng mới.\n"
+" -G, --basic-regexp MẪU là một biểu thức chính quy cơ bản (BRE).\n"
+" -P, --perl-regexp MẪU là một biểu thức chính quy 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=MẪU sử dụng MẪU ấy như là _biểu thức chính quy_\n"
-" -f, --file=TẬP_TIN gọi MẪU từ _TẬP TIN_\n"
-" -i, --ignore-case _bỏ qua chữ hoa/thường_\n"
-" -w, --word-regexp buộc MẪU khớp với chỉ _từ_ toàn bộ\n"
-" -x, --line-regexp buộc MẪU khớp với chỉ _dòng_ toàn bộ\n"
-" -z, --null-data dòng _dữ liệu_ kết thúc bằng _0_ byte, không bằng dòng mới\n"
-
-#: src/grep.c:1071
+" -e, --regexp=MẪU dùng MẪU để khớp\n"
+" -f, --file=TẬP_TIN lấy MẪU từ TẬP_TIN\n"
+" -i, --ignore-case không phân biệt chữ hoa/thường\n"
+" -w, --word-regexp buộc MẪU chỉ khớp nguyên từ\n"
+" -x, --line-regexp buộc MẪU chỉ khớp nguyên dòng\n"
+" -z, --null-data một dòng dữ liệu kết thúc bằng 0 byte,\n"
+"\t\t\t\t\t\tkhông phải ký tự dòng mới\n"
+
+#: src/grep.c:1443
+#, c-format
msgid ""
"\n"
"Miscellaneous:\n"
@@ -160,13 +176,14 @@ msgid ""
msgstr ""
"\n"
"Lặt vặt:\n"
-" -s, --no-messages _không thông báo_ lỗi\n"
-" -v, --invert-match chọn dòng không _khớp_ với nhau (_đảo_)\n"
-" -V, --version in ra thông tin _phiên bản_ rồi thoát\n"
-" --help hiển thị _trợ giúp_ này rồi thoát\n"
-" --mmap sử dụng dữ liệu nhập có _bảng bộ nhớ_ nếu có thể\n"
+" -s, --no-messages thu hồi các thông điệp lỗi\n"
+" -v, --invert-match chọn các dòng không khớp\n"
+" -V, --version in ra thông tin phiên bản rồi thoát\n"
+" --help hiển thị trợ giúp này rồi thoát\n"
+" --mmap dùng dữ liệu nhập đã ánh xạ bộ nhớ nếu có thể\n"
-#: src/grep.c:1079
+#: src/grep.c:1451
+#, c-format
msgid ""
"\n"
"Output control:\n"
@@ -179,54 +196,65 @@ 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"
-"Điều khiển dữ liệu xuất:\n"
-" -m, --max-count=SỐ ngừng sau đã khớp SỐ lần (_tối đa tổng số_)\n"
-" -b, --byte-offset in ra _khoảng chừa trống byte_ với mọi dòng xuất\n"
-" -n, --line-number in ra _số dòng_ với mọi dòng xuất\n"
-" --line-buffered xóa sạch dữ liệu xuất trên mọi _dòng_ (_đệm_)\n"
-" -H, --with-filename in ra _tên_ của mọi _tập tin_ khớp (_có_)\n"
-" -h, --no-filename thu hồi _tên tập tin_ tiền tố với dữ liệu xuất (_không_)\n"
-" --label=NHÃN in ra NHÃN là tên tập tin cho dữ liệu nhập chuẩn\n"
-" -o, --only-matching hiển thị _chỉ_ phần dòng _khớp_ với MẪU\n"
-" -q, --quiet, --silent thu hồi tất cả dữ liệu xuất bình thường (_im_)\n"
-" --binary-files=LOẠI giả định các _tập tin nhị phân_ có LOẠI ấy\n"
-" \t\t\t\t\t\tLOẠI là 'binary' (nhị phân), 'text' (văn bản), \t\t\t\t\t\t\thay 'without-match' (không khớp với gì)\n"
-" -a, --text \t\tbằng tùy chọn --binary-files=text\n"
-" -I \t\t\tbằng tùy chọn --binary-files=without-match\n"
-" -d, --directories=HÀNH_ĐỘNG \tcách xử lý thư mục\n"
-" \t\t\t\t\tHÀNH ĐỘNG là 'read' (đọc), 'recurse' (đệ qui), \t\t\t\t\t\t\t\thay 'skip' (bỏ qua)\n"
-" -D, --devices=HÀNH_ĐỘNG cách xử lý thiết bị, FIFO (đường ống loại \n"
-"\t\t\t\t\t\t\tvào trước nên ra trước) và ổ cắm\n"
-" \t\t\t\tHÀNH ĐỘNG là 'read' (đọc) hay 'skip' (bỏ qua)\n"
-" -R, -r, --recursive \tbằng tùy chọn --directories=recurse\n"
-" --include=MẪU \t\tsẽ khám xét mọi tập tin khớp với MẪU (_bao gồm_)\n"
-" --exclude=MẪU \t\tsẽ bỏ qua mọi tập tin khớp với MẪU (_loại trừ_)\n"
-" --exclude-from=TẬPTIN sẽ bỏ qua mọi tập tin khớp với MẪU trong TẬP TIN\n"
-"\t\t\t\t\t\t\t(_loại trừ ... ra_)\n"
-" -L, --files-without-match chỉ in ra tên _TẬP TIN không khớp với gì_\n"
-" -l, --files-with-matches chỉ in ra tên _TẬP TIN khớp với gì_\n"
-" -c, --count \t\tchỉ in ra một _tổng số_ dòng khớp của mỗi TẬP TIN\n"
-" -Z, --null \t\tin ra _0_ byte sau tên TẬP TIN\n"
-
-#: src/grep.c:1107
+"Điều khiển kết xuất:\n"
+" -m, --max-count=SỐ dừng sau số lần khớp này\n"
+" -b, --byte-offset in ra hiệu byte với dòng xuất\n"
+" -n, --line-number in ra số thứ tự dòng với dòng xuất\n"
+" --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"
+" -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"
+"\t\t\t\t\t\t• binary\tnhị phân\n"
+"\t\t\t\t\t\t• text\tvăn bản\n"
+"\t\t\t\t\t\t• without-match không khớp\n"
+" -a, --text bằng « --binary-files=text »\n"
+" -I bằng « --binary-files=without-match »\n"
+" -d, --directories=HÀNH_ĐỘNG \t cách quản lý các thư mục; HÀNH_ĐỘNG là:\n"
+"\t\t\t\t\t\t• read\t đọc\n"
+"\t\t\t\t\t\t• recurse\t đệ qui\n"
+"\t\t\t\t\t\t• skip\t bỏ qua\n"
+" -D, --devices=HÀNH_ĐỘNG cách quản lý các thiết bị, FIFO và ổ cắm;\n"
+"\t\t\t\t\t\t\tHÀNH_ĐỘNG là:\n"
+"\t\t\t\t\t\t• read\t đọc\n"
+"\t\t\t\t\t\t• skip\t bỏ qua\n"
+" -R, -r, --recursive bằng « --directories=recurse »\n"
+" --include=MẪU_TẬP_TIN \ttìm chỉ những tập tin khớp mẫu tập tin này\n"
+" --exclude=MẪU_TẬP_TIN \tbỏ qua các tập tin/thư mục khớp mẫu tập tin này\n"
+" --exclude-from=TẬP_TIN \tbỏ qua các tập tin khớp mẫu tập tin nào\n"
+"\t\t\t\t\t\t\ttừ tập tin này\n"
+" --exclude-dir=MẪU\tbỏ qua các thư mục khớp mẫu này\n"
+" -L, --files-without-match \t\tin ra chỉ tên của những tập tin không chứa\n"
+"\t\t\t\t\t\t\tchuỗi khớp\n"
+" -l, --files-with-matches \tin ra chỉ tên của các tập tin chứa chuỗi khớp\n"
+" -c, --count \tin ra chỉ số đếm những dòng khớp trong mỗi tập tin\n"
+" -T, --initial-tab \tcanh lề các cột tab (nếu cần)\n"
+" -Z, --null \tin ra 0 byte sau tên tập tin\n"
+
+#: src/grep.c:1481
+#, c-format
msgid ""
"\n"
"Context control:\n"
@@ -235,151 +263,198 @@ 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"
"Điều khiển ngữ cảnh:\n"
-" -B, --before-context=SỐ \t\tin ra SỐ dòng của _ngữ cảnh_ đi _trước_\n"
-" -A, --after-context=SỐ \t\tin ra SỐ dòng của _ngữ cảnh_ theo _sau_\n"
-" -C, --context=SỐ \t\tin ra SỐ dòng của _ngữ cảnh_ xuất\n"
-" -SỐ \t\t\tbằng --context=SỐ\n"
-" --color[=KHI_NÀO],\t\t(chính tả Mỹ) --colour[=KHI_NÀO] \t(chính tả Anh, Úc)\t\t\t\t\t\t\tsử dụng dấu khác để phân biệt chuỗi khớp\n"
-" \t\t\t\t\tKHI NÀO có thể là `always' (luôn luôn),\n"
-"\t\t\t\t\t\t\t`never' (không bao giờ) hay `auto' (tự động).\n"
-" -U, --binary \t\t\tkhông tước ký tự về đầu dòng (CR) ở đầu cuối \n"
-"\t\t\t\t\t\t\t\tdòng (EOL) (MSDOS)\n"
-" -u, --unix-byte-offsets \tthông báo khoảng chừa trống như thế ký tự về \n"
-"\t\t\t\t\t\t\tđầu dòng (CR) không ở đó (MSDOS)\n"
+" -B, --before-context=SỐ\tin ra SỐ dòng ngữ cảnh đi trước\n"
+" -A, --after-context=SỐ \tin ra SỐ dòng ngữ cảnh theo sau\n"
+" -C, --context=SỐ \t\tin ra SỐ dòng ngữ cảnh kết xuất\n"
+" -NUM \t\tbằng « --context=SỐ »\n"
+" --color[=KHI],\n"
+"\t(chính tả Mỹ)\n"
+" --colour[=KHI] \t(chính tả tiếng Anh)\n"
+"\t\t\t\t\tdùng dấu để tô sáng các chuỗi khớp; KHI nào :\n"
+"\t\t\t\t\t • always\t\tluôn luôn\n"
+"\t\t\t\t\t • never\t\tkhông bao giờ\n"
+"\t\t\t\t\t • auto\t\ttự động (viết tắt)\n"
+" -U, --binary \tđừng gỡ bỏ các ký tự CR ở kết thúc dòng (MSDOS)\n"
+" -u, --unix-byte-offsets\tthông báo các hiệu số đúng như không có CR (MSDOS)\n"
"\n"
-"`egrep' có nghĩa `grep -E'.\n"
-"`fgrep' có nghĩa `grep -F'.\n"
-"Khi không có TẬP TIN nào, hoặc khi TẬP TIN là -, thì hãy đọc dữ liệu nhập chuẩn. \n"
-"Nếu ít hơn hai TẬP TIN đưa ra, hãy giả định -h.\n"
-" Trạng thái thoát là 0 nếu có khớp gì, 1 nếu không khớp gì, và 2 nếu gặp khó nào.\n"
-#: src/grep.c:1124
+#: 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"
+
+#: 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"
+
+#: 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 » nên là « grep -E », « fgrep » nên là « grep -F ».\n"
+"Gọi trực tiếp hoặc « egrep » hoặc « fgrep » bị phản đối.\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 ""
+"Không có TẬP_TIN, hoặc khi TẬP_TIN là « - » thì đọc thiết bị nhập 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"
+
+#: src/grep.c:1509
+#, c-format
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <%s>.\n"
msgstr ""
"\n"
-"Báo cáo lỗi nào cho <bug-grep@gnu.org>.\n"
+"Báo cáo lỗi nào cho <%s>.\n"
-#: src/grep.c:1134
+#: src/grep.c:1522
msgid "conflicting matchers specified"
msgstr "đã ghi rõ dữ liệu khớp mà xung đột"
-#: src/grep.c:1376
+#: src/grep.c:1715
+#, 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
+#, 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
+#, 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
+#, 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
msgid "unknown devices method"
-msgstr "không biết cách thức thiết bị"
+msgstr "không nhận ra phương pháp thiết bị"
-#: src/grep.c:1443
+#: src/grep.c:1956
msgid "unknown directories method"
-msgstr "không biết cách thức thư mục"
+msgstr "không nhận ra phương pháp thư mục"
-#: src/grep.c:1510
+#: src/grep.c:2023
msgid "invalid max count"
-msgstr "tối đa tổng số không hợp lệ"
+msgstr "số đếm tối đa không hợp lệ"
-#: src/grep.c:1565
+#: src/grep.c:2078
msgid "unknown binary-files type"
-msgstr "không biết loại tập tin nhị phân"
+msgstr "không nhận ra kiểu tập tin nhị phân (binary-files)"
-#: src/grep.c:1660
+#: src/grep.c:2182
#, c-format
-msgid "%s (GNU grep) %s\n"
-msgstr "%s (trình grep của GNU) %s\n"
+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:1662
-msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
-msgstr "Bản quyền năm 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc. (Tổ chức Phần mềm Tự do)\n"
-
-#: src/grep.c:1664
+#: src/grep.c:2184
+#, c-format
msgid ""
-"This is free software; see the source for copying conditions. There is NO\n"
+"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 ""
-"Phần mềm này tự do; hãy xem mã nguồn để tìm thấy điều kiện sao chép.\n"
-"Không bảo đảm gì cả, dù khả năng bán hay khả năng làm việc dứt khoát.\n"
-
-#: src/search.c:606
-msgid "The -P option is not supported"
-msgstr "Chưa hỗ trợ tùy chọn -P"
+"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"
#: src/search.c:619
+msgid "Support for the -P option is not compiled into this --disable-perl-regexp binary"
+msgstr "Khả năng hỗ trợ tùy chọn « -P » không được biên dịch vào tập tin nhị phân « --disable-perl-regexp » này"
+
+#: src/search.c:632
msgid "The -P and -z options cannot be combined"
-msgstr "Không kết hợp được hai tùy chọn -P và -z"
+msgstr "Không thể dùng với nhau hai tùy chọn « -P » và « -z »"
+
+#: src/search.c:634
+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
msgid "Unknown system error"
-msgstr "Gặp lỗi hệ thống không biết"
+msgstr "Lỗi hệ thống không rõ"
#: lib/getopt.c:675
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tùy chọn `%s' là mơ hồ\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
#: lib/getopt.c:700
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn `--%s' không cho phép đối số\n"
+msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
#: lib/getopt.c:705
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn `%c%s' không cho phép đối sô\n"
+msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
#: lib/getopt.c:723 lib/getopt.c:896
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tùy chọn `%s' cần đến đối số\n"
+msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
#. --option
#: lib/getopt.c:752
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: chưa chấp nhận tùy chọn `--%s'\n"
+msgstr "%s: không nhận ra tùy chọn « --%s »\n"
#. +option or -option
#: lib/getopt.c:756
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: chưa chấp nhận tùy chọn `%c%s'\n"
+msgstr "%s: không nhận ra tùy chọn « %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: không cho phép tùy chọn -- %c\n"
+msgstr "%s: tùy chọn cấm « --%c »\n"
#: lib/getopt.c:785
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: tùy chọn không hợp lệ -- %c\n"
+msgstr "%s: tùy chọn không hợp lệ « --%c »\n"
#. 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: tùy chọn cần đến đối số -- %c\n"
+msgstr "%s: tùy chọn cần thiết đối số « --%c »\n"
#: lib/getopt.c:862
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn `-W %s' là mơ hồ\n"
+msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
#: lib/getopt.c:880
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn `-W %s' không cho phép đối số\n"
+msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
#. Get translations for open and closing quotation marks.
#.
@@ -397,8 +472,17 @@ msgstr "%s: tùy chọn `-W %s' không cho phép đối số\n"
#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
#: lib/quotearg.c:259
msgid "`"
-msgstr "«"
+msgstr "« "
#: lib/quotearg.c:260
msgid "'"
-msgstr "»"
+msgstr " »"
+
+#~ msgid "out of memory"
+#~ msgstr "hết bộ nhớ"
+
+#~ msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
+#~ msgstr "Cách sử dụng: %s [TÙYCHỌN]... MẪU [TẬPTIN]...\n"
+
+#~ msgid "%s (GNU grep) %s\n"
+#~ msgstr "%s (trình grep của GNU) %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bb9b915b..e26cbf92 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: grep 2.5g\n"
-"POT-Creation-Date: 2002-03-26 16:38+0100\n"
+"POT-Creation-Date: 2002-01-22 14:39+0100\n"
"PO-Revision-Date: 2004-12-01 01:01+0800\n"
"Last-Translator: Yuan-Chen Cheng <ycheng@sinica.edu.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -56,8 +56,8 @@ msgstr "t諸 )"
msgid "out of memory"
msgstr "Oκ"
-#: 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/kwset.c:171 src/kwset.c:177 src/search.c:103
+#: src/search.c:209 src/search.c:293
msgid "memory exhausted"
msgstr "Oκ"
@@ -65,48 +65,48 @@ msgstr "Oκ"
msgid "invalid context length argument"
msgstr "LĪפ޼"
-#: src/grep.c:479
+#: src/grep.c:475
msgid "input is too large to count"
msgstr "JLLkp"
-#: src/grep.c:605
+#: src/grep.c:597
msgid "writing output"
msgstr "bX"
-#: src/grep.c:878
+#: src/grep.c:870
#, c-format
msgid "Binary file %s matches\n"
msgstr "Gi榡ɮ %s ŦX\n"
-#: src/grep.c:892
+#: src/grep.c:884
msgid "(standard input)"
msgstr "(зǿJ)"
-#: src/grep.c:997
+#: src/grep.c:989
#, c-format
msgid "warning: %s: %s\n"
msgstr "ĵi: %s: %s\n"
-#: src/grep.c:998
+#: src/grep.c:990
msgid "recursive directory loop"
msgstr "jؿc"
-#: src/grep.c:1046
+#: src/grep.c:1038
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
msgstr "Ϊk: %s [ﶵ]... ˪O [ɮ]...\n"
-#: src/grep.c:1048
+#: src/grep.c:1040
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Шϥ `%s --help' H\ŪhT.\n"
-#: src/grep.c:1053
+#: src/grep.c:1045
#, c-format
msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
msgstr "Ϊk: %s [ﶵ]... ˪O [ɮ]...\n"
-#: src/grep.c:1054
+#: src/grep.c:1046
#, c-format
msgid ""
"Search for PATTERN in each FILE or standard input.\n"
@@ -119,7 +119,7 @@ msgstr ""
"\n"
"WﶵHθĶ:\n"
-#: src/grep.c:1059
+#: src/grep.c:1051
msgid ""
" -E, --extended-regexp PATTERN is an extended regular expression\n"
" -F, --fixed-strings PATTERN is a set of newline-separated strings\n"
@@ -131,7 +131,7 @@ msgstr ""
" -G, --basic-regexp PATTERN O@Ӱ򥻪Wܦ\n"
" -P, --perl-regexp PATTERN O@ Perl Wܦ\n"
-#: src/grep.c:1064
+#: src/grep.c:1056
msgid ""
" -e, --regexp=PATTERN use PATTERN as a regular expression\n"
" -f, --file=FILE obtain PATTERN from FILE\n"
@@ -147,7 +147,7 @@ msgstr ""
" -x, --line-regexp H˪O(PATTERN)M, t@ӫDq\n"
" -z, --null-data CƥH 0 oӦ줸, ӫDŸ\n"
-#: src/grep.c:1071
+#: src/grep.c:1063
msgid ""
"\n"
"Miscellaneous:\n"
@@ -165,7 +165,7 @@ msgstr ""
" --help ܦϥΤkᵲ\n"
" --mmap pG\, JɮרϥΰOk\n"
-#: src/grep.c:1079
+#: src/grep.c:1071
msgid ""
"\n"
"Output control:\n"
@@ -223,7 +223,7 @@ msgstr ""
" -c, --count uwCɮצCXɮ׬۲ŭӼ\n"
" -Z, --null bɦWX@ӭȬ 0 줸\n"
-#: src/grep.c:1107
+#: src/grep.c:1099
msgid ""
"\n"
"Context control:\n"
@@ -259,45 +259,44 @@ msgstr ""
"֩, h]w -h ѼƦJ. ], {^ǪA 0, _h\n"
"Ǧ^ 1, pG{椤X{~, hǦ^ 2.\n"
-#: src/grep.c:1124
-#, fuzzy
+#: src/grep.c:1116
msgid ""
"\n"
-"Report bugs to <bug-grep@gnu.org>.\n"
+"Report bugs to <bug-gnu-utils@gnu.org>.\n"
msgstr ""
"\n"
"бNo{~AHqllH <bug-gnu-utils@gnu.org>\n"
-#: src/grep.c:1134
+#: src/grep.c:1126
msgid "conflicting matchers specified"
msgstr "wF۽Ĭ𪺼˪O"
-#: src/grep.c:1376
+#: src/grep.c:1363
msgid "unknown devices method"
msgstr "˸mk"
-#: src/grep.c:1443
+#: src/grep.c:1430
msgid "unknown directories method"
msgstr "ؿk"
-#: src/grep.c:1510
+#: src/grep.c:1497
msgid "invalid max count"
msgstr "LĪ̤jp"
-#: src/grep.c:1565
+#: src/grep.c:1551
msgid "unknown binary-files type"
msgstr "Giɮ׫A"
-#: src/grep.c:1660
+#: src/grep.c:1646
#, c-format
msgid "%s (GNU grep) %s\n"
msgstr "%s (GNU grep) %s\n"
-#: src/grep.c:1662
+#: src/grep.c:1648
msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
msgstr "vҦ 1988, 1992-1999, 2000, 2001 ۥѳn|.\n"
-#: src/grep.c:1664
+#: 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"