12 files changed, 96 insertions, 107 deletions

diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 9e151c9c6a1d..7d9dd2481fd8 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -68,14 +68,14 @@ nl_catd	 catalog;
 const char	*errstr[] = {
 	"",
 /* 1*/	"(standard input)",
-/* 3*/	"unknown %s option",
-/* 4*/	"usage: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A num] [-B num] [-C[num]]\n",
-/* 5*/	"\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n",
-/* 6*/	"\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n",
-/* 7*/	"\t[--null] [pattern] [file ...]\n",
-/* 8*/	"Binary file %s matches\n",
-/* 9*/	"%s (BSD grep) %s\n",
-/* 10*/	"%s (BSD grep, GNU compatible) %s\n",
+/* 2*/	"unknown %s option",
+/* 3*/	"usage: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A num] [-B num] [-C[num]]\n",
+/* 4*/	"\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n",
+/* 5*/	"\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n",
+/* 6*/	"\t[--null] [pattern] [file ...]\n",
+/* 7*/	"Binary file %s matches\n",
+/* 8*/	"%s (BSD grep) %s\n",
+/* 9*/	"%s (BSD grep, GNU compatible) %s\n",
 };
 
 /* Flags passed to regcomp() and regexec() */
diff --git a/usr.bin/grep/nls/C.msg b/usr.bin/grep/nls/C.msg
index a86bafa92fe1..81573b587a84 100644
--- a/usr.bin/grep/nls/C.msg
+++ b/usr.bin/grep/nls/C.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(standard input)"
-2 "cannot read bzip2 compressed file"
-3 "unknown %s option"
-4 "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A num] [-B num] [-C[num]]\n"
-5 "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n"
-6 "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n"
-7 "\t[--null] [pattern] [file ...]\n"
-8 "Binary file %s matches\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "unknown %s option"
+3 "usage: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A num] [-B num] [-C[num]]\n"
+4 "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n"
+5 "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n"
+6 "\t[--null] [pattern] [file ...]\n"
+7 "Binary file %s matches\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/es_ES.ISO8859-1.msg b/usr.bin/grep/nls/es_ES.ISO8859-1.msg
index fc65913d8c9d..77df985f22d0 100644
--- a/usr.bin/grep/nls/es_ES.ISO8859-1.msg
+++ b/usr.bin/grep/nls/es_ES.ISO8859-1.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(entrada est�ndar)"
-2 "no se puede leer el fichero comprimido bzip2"
-3 "opci�n desconocida de %s"
-4 "uso: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A no] [-B no] [-C[no]]\n"
-5 "\t[-e pauta] [-f fichero] [--binary-files=valor] [--color=cuando]\n"
-6 "\t[--context[=no]] [--directories=acci�n] [--label] [--line-buffered]\n"
-7 "\t[--null] [pauta] [fichero ...]\n"
-8 "fichero binario %s se ajusta\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "opci�n desconocida de %s"
+3 "uso: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A no] [-B no] [-C[no]]\n"
+4 "\t[-e pauta] [-f fichero] [--binary-files=valor] [--color=cuando]\n"
+5 "\t[--context[=no]] [--directories=acci�n] [--label] [--line-buffered]\n"
+6 "\t[--null] [pauta] [fichero ...]\n"
+7 "fichero binario %s se ajusta\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/gl_ES.ISO8859-1.msg b/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
index 6de2798bbed1..4cce8eb4d767 100644
--- a/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
+++ b/usr.bin/grep/nls/gl_ES.ISO8859-1.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(entrada est�ndar)"
-2 "non se pode ler o ficheiro comprimido bzip2"
-3 "opci�n desco�ecida de %s"
-4 "uso: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A no] [-B no] [-C[no]]\n"
-5 "\t[-e pauta] [-f ficheiro] [--binary-files=valor] [--color=cando]\n"
-6 "\t[--context[=no]] [--directories=acci�n] [--label] [--line-buffered]\n"
-7 "\t[--null] [pauta] [ficheiro ...]\n"
-8 "ficheiro binario %s conforma\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "opci�n desco�ecida de %s"
+3 "uso: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A no] [-B no] [-C[no]]\n"
+4 "\t[-e pauta] [-f ficheiro] [--binary-files=valor] [--color=cando]\n"
+5 "\t[--context[=no]] [--directories=acci�n] [--label] [--line-buffered]\n"
+6 "\t[--null] [pauta] [ficheiro ...]\n"
+7 "ficheiro binario %s conforma\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/hu_HU.ISO8859-2.msg b/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
index c7740705947f..a0ca08f4ef5d 100644
--- a/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
+++ b/usr.bin/grep/nls/hu_HU.ISO8859-2.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(szabv�nyos bemenet)"
-2 "bzip2 t�m�r�tett f�jl nem olvashat�"
-3 "ismeretlen %s opci�"
-4 "haszn�lat: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A sz�m] [-B sz�m] [-C[sz�m]]\n"
-5 "\t[-e minta] [-f f�jl] [--binary-files=�rt�k] [--color=mikor]\n"
-6 "\t[--context[=sz�m]] [--directories=m�velet] [--label] [--line-buffered]\n"
-7 "\t[--null] [minta] [f�jl ...]\n"
-8 "%s bin�ris f�jl illeszkedik\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "ismeretlen %s opci�"
+3 "haszn�lat: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A sz�m] [-B sz�m] [-C[sz�m]]\n"
+4 "\t[-e minta] [-f f�jl] [--binary-files=�rt�k] [--color=mikor]\n"
+5 "\t[--context[=sz�m]] [--directories=m�velet] [--label] [--line-buffered]\n"
+6 "\t[--null] [minta] [f�jl ...]\n"
+7 "%s bin�ris f�jl illeszkedik\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ja_JP.SJIS.msg b/usr.bin/grep/nls/ja_JP.SJIS.msg
index 8f532c4881c6..654a1f2045fb 100644
--- a/usr.bin/grep/nls/ja_JP.SJIS.msg
+++ b/usr.bin/grep/nls/ja_JP.SJIS.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(�W������)"
-2 "bzip2 ���k�t�@�C����ǂݍ��ނ��Ƃ��ł��܂���"
-3 "%s �I�v�V�����̎w��l�Ɍ�肪����܂�"
-4 "�g����: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A ����] [-B ����] [-C[����]]\n"
-5 "\t[-e �p�^�[��] [-f �t�@�C����] [--binary-files=�l] [--color=�l]\n"
-6 "\t[--context[=����]] [--directories=����] [--label] [--line-buffered]\n"
-7 "\t[--null] [�p�^�[��] [�t�@�C���� ...]\n"
-8 "�o�C�i���t�@�C�� %s �Ƀ}�b�`���܂���\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "%s �I�v�V�����̎w��l�Ɍ�肪����܂�"
+3 "�g����: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A ����] [-B ����] [-C[����]]\n"
+4 "\t[-e �p�^�[��] [-f �t�@�C����] [--binary-files=�l] [--color=�l]\n"
+5 "\t[--context[=����]] [--directories=����] [--label] [--line-buffered]\n"
+6 "\t[--null] [�p�^�[��] [�t�@�C���� ...]\n"
+7 "�o�C�i���t�@�C�� %s �Ƀ}�b�`���܂���\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ja_JP.UTF-8.msg b/usr.bin/grep/nls/ja_JP.UTF-8.msg
index e59708bda7ae..77c2ca698c51 100644
--- a/usr.bin/grep/nls/ja_JP.UTF-8.msg
+++ b/usr.bin/grep/nls/ja_JP.UTF-8.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(標準入力)"
-2 "bzip2 圧縮ファイルを読み込むことができません"
-3 "%s オプションの指定値に誤りがあります"
-4 "使い方: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A 数字] [-B 数字] [-C[数字]]\n"
-5 "\t[-e パターン] [-f ファイル名] [--binary-files=値] [--color=値]\n"
-6 "\t[--context[=数字]] [--directories=動作] [--label] [--line-buffered]\n"
-7 "\t[--null] [パターン] [ファイル名 ...]\n"
-8 "バイナリファイル %s にマッチしました\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "%s オプションの指定値に誤りがあります"
+3 "使い方: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A 数字] [-B 数字] [-C[数字]]\n"
+4 "\t[-e パターン] [-f ファイル名] [--binary-files=値] [--color=値]\n"
+5 "\t[--context[=数字]] [--directories=動作] [--label] [--line-buffered]\n"
+6 "\t[--null] [パターン] [ファイル名 ...]\n"
+7 "バイナリファイル %s にマッチしました\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ja_JP.eucJP.msg b/usr.bin/grep/nls/ja_JP.eucJP.msg
index 8f2e97dcb906..5e5184034421 100644
--- a/usr.bin/grep/nls/ja_JP.eucJP.msg
+++ b/usr.bin/grep/nls/ja_JP.eucJP.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(ɸ������)"
-2 "bzip2 ���̥ե�������ɤ߹��ळ�Ȥ��Ǥ��ޤ���"
-3 "%s ���ץ����λ����ͤ˸��꤬����ޤ�"
-4 "�Ȥ���: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A ����] [-B ����] [-C[����]]\n"
-5 "\t[-e �ѥ�����] [-f �ե�����̾] [--binary-files=��] [--color=��]\n"
-6 "\t[--context[=����]] [--directories=ư��] [--label] [--line-buffered]\n"
-7 "\t[--null] [�ѥ�����] [�ե�����̾ ...]\n"
-8 "�Х��ʥ�ե����� %s �˥ޥå����ޤ���\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "%s ���ץ����λ����ͤ˸��꤬����ޤ�"
+3 "�Ȥ���: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A ����] [-B ����] [-C[����]]\n"
+4 "\t[-e �ѥ�����] [-f �ե�����̾] [--binary-files=��] [--color=��]\n"
+5 "\t[--context[=����]] [--directories=ư��] [--label] [--line-buffered]\n"
+6 "\t[--null] [�ѥ�����] [�ե�����̾ ...]\n"
+7 "�Х��ʥ�ե����� %s �˥ޥå����ޤ���\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/pt_BR.ISO8859-1.msg b/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
index 15d777a3dd77..7655dbcc4473 100644
--- a/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
+++ b/usr.bin/grep/nls/pt_BR.ISO8859-1.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(entrada padr�o)"
-2 "n�o se posso ler o fichero comprimido bzip2"
-3 "opc�o n�o conhecida de %s"
-4 "uso: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A num] [-B num] [-C[num]]\n"
-5 "\t[-e padr�o] [-f arquivo] [--binary-files=valor] [--color=quando]\n"
-6 "\t[--context[=num]] [--directories=a��o] [--label] [--line-buffered]\n"
-7 "\t[--null] [padr�o] [arquivo ...]\n"
-8 "arquivo bin�rio %s casa com o padr�o\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "opc�o n�o conhecida de %s"
+3 "uso: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A num] [-B num] [-C[num]]\n"
+4 "\t[-e padr�o] [-f arquivo] [--binary-files=valor] [--color=quando]\n"
+5 "\t[--context[=num]] [--directories=a��o] [--label] [--line-buffered]\n"
+6 "\t[--null] [padr�o] [arquivo ...]\n"
+7 "arquivo bin�rio %s casa com o padr�o\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/ru_RU.KOI8-R.msg b/usr.bin/grep/nls/ru_RU.KOI8-R.msg
index f12b1b64a1c7..7740414fc338 100644
--- a/usr.bin/grep/nls/ru_RU.KOI8-R.msg
+++ b/usr.bin/grep/nls/ru_RU.KOI8-R.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(����������� ����)"
-2 "�� ���� ��������� ������ � bzip2 ����"
-3 "����������� ���� %s"
-4 "�������������: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A ���] [-B ���] [-C[���]]\n"
-5 "\t[-e ������] [-f ����] [--binary-files=��������] [--color=�����]\n"
-6 "\t[--context[=���]] [--directories=��������] [--label] [--line-buffered]\n"
-7 "\t[--null] [������] [���� ...]\n"
-8 "�������� ���� %s ���������\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "����������� ���� %s"
+3 "�������������: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A ���] [-B ���] [-C[���]]\n"
+4 "\t[-e ������] [-f ����] [--binary-files=��������] [--color=�����]\n"
+5 "\t[--context[=���]] [--directories=��������] [--label] [--line-buffered]\n"
+6 "\t[--null] [������] [���� ...]\n"
+7 "�������� ���� %s ���������\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/uk_UA.UTF-8.msg b/usr.bin/grep/nls/uk_UA.UTF-8.msg
index 4564a59e7550..0f4650e24682 100644
--- a/usr.bin/grep/nls/uk_UA.UTF-8.msg
+++ b/usr.bin/grep/nls/uk_UA.UTF-8.msg
@@ -2,12 +2,11 @@ $ $FreeBSD$
 $set 1
 $quote "
 1 "(стандартний ввід)"
-2 "не можу прочитати стиснутий bzip2 файл"
-3 "невiдома опція %s"
-4 "використання: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A чис] [-B чис] [-C[чис]]\n"
-5 "\t[-e шаблон] [-f файл] [--binary-files=значення] [--color=коли]\n"
-6 "\t[--context[=чис] [--directories=дія] [--label] [--line-buffered]\n"
-7 "\t[--null] [шаблон] [файл ...]\n"
-8 "двійковий файл %s співпадає\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "невiдома опція %s"
+3 "використання: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A чис] [-B чис] [-C[чис]]\n"
+4 "\t[-e шаблон] [-f файл] [--binary-files=значення] [--color=коли]\n"
+5 "\t[--context[=чис] [--directories=дія] [--label] [--line-buffered]\n"
+6 "\t[--null] [шаблон] [файл ...]\n"
+7 "двійковий файл %s співпадає\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"
diff --git a/usr.bin/grep/nls/zh_CN.UTF-8.msg b/usr.bin/grep/nls/zh_CN.UTF-8.msg
index b727316c8bec..69ae1531b7c1 100644
--- a/usr.bin/grep/nls/zh_CN.UTF-8.msg
+++ b/usr.bin/grep/nls/zh_CN.UTF-8.msg
@@ -3,12 +3,11 @@ $
 $set 1
 $quote "
 1 "(标准输入)"
-2 "读取 bzip2 压缩文件时出错"
-3 "选项 %s 无法识别"
-4 "用法： %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A 行数] [-B 行数] [-C[行数]]\n"
-5 "\t[-e 模式] [-f 文件] [--binary-files=值] [--color=何时]\n"
-6 "\t[--context[=行数]] [--directories=动作] [--label] [--line-buffered]\n"
-7 "\t[--null] [模式] [文件名 ...]\n"
-8 "二进制文件 %s 包含模式\n"
-9 "%s (BSD grep) %s\n"
-10 "%s (BSD grep, GNU compatible) %s\n"
+2 "选项 %s 无法识别"
+3 "用法： %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A 行数] [-B 行数] [-C[行数]]\n"
+4 "\t[-e 模式] [-f 文件] [--binary-files=值] [--color=何时]\n"
+5 "\t[--context[=行数]] [--directories=动作] [--label] [--line-buffered]\n"
+6 "\t[--null] [模式] [文件名 ...]\n"
+7 "二进制文件 %s 包含模式\n"
+8 "%s (BSD grep) %s\n"
+9 "%s (BSD grep, GNU compatible) %s\n"