Date: Wed, 25 Apr 2018 15:41:50 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333000 - in head/usr.bin/grep: . nls Message-ID: <201804251541.w3PFfoXG006806@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Wed Apr 25 15:41:50 2018 New Revision: 333000 URL: https://svnweb.freebsd.org/changeset/base/333000 Log: bsdgrep: Update NLS catalogs after r332995 Compression was removed so #2 goes away and everything else needs renumbered to match, and the usage string was also updated due to removed options. X-MFC-With: r332995 Modified: head/usr.bin/grep/grep.c head/usr.bin/grep/nls/C.msg head/usr.bin/grep/nls/es_ES.ISO8859-1.msg head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg head/usr.bin/grep/nls/ja_JP.SJIS.msg head/usr.bin/grep/nls/ja_JP.UTF-8.msg head/usr.bin/grep/nls/ja_JP.eucJP.msg head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg head/usr.bin/grep/nls/ru_RU.KOI8-R.msg head/usr.bin/grep/nls/uk_UA.UTF-8.msg head/usr.bin/grep/nls/zh_CN.UTF-8.msg Modified: head/usr.bin/grep/grep.c ============================================================================== --- head/usr.bin/grep/grep.c Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/grep.c Wed Apr 25 15:41:50 2018 (r333000) @@ -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() */ Modified: head/usr.bin/grep/nls/C.msg ============================================================================== --- head/usr.bin/grep/nls/C.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/C.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -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" Modified: head/usr.bin/grep/nls/es_ES.ISO8859-1.msg ============================================================================== --- head/usr.bin/grep/nls/es_ES.ISO8859-1.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/es_ES.ISO8859-1.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -3,12 +3,11 @@ $ $set 1 $quote " 1 "(entrada estndar)" -2 "no se puede leer el fichero comprimido bzip2" -3 "opcin 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=accin] [--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 "opcin 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=accin] [--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" Modified: head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg ============================================================================== --- head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/gl_ES.ISO8859-1.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -3,12 +3,11 @@ $ $set 1 $quote " 1 "(entrada estndar)" -2 "non se pode ler o ficheiro comprimido bzip2" -3 "opcin descoecida 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=accin] [--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 "opcin descoecida 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=accin] [--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" Modified: head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg ============================================================================== --- head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/hu_HU.ISO8859-2.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -3,12 +3,11 @@ $ $set 1 $quote " 1 "(szabvnyos bemenet)" -2 "bzip2 tmrtett fjl nem olvashat" -3 "ismeretlen %s opci" -4 "hasznlat: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A szm] [-B szm] [-C[szm]]\n" -5 "\t[-e minta] [-f fjl] [--binary-files=rtk] [--color=mikor]\n" -6 "\t[--context[=szm]] [--directories=mvelet] [--label] [--line-buffered]\n" -7 "\t[--null] [minta] [fjl ...]\n" -8 "%s binris fjl illeszkedik\n" -9 "%s (BSD grep) %s\n" -10 "%s (BSD grep, GNU compatible) %s\n" +2 "ismeretlen %s opci" +3 "hasznlat: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A szm] [-B szm] [-C[szm]]\n" +4 "\t[-e minta] [-f fjl] [--binary-files=rtk] [--color=mikor]\n" +5 "\t[--context[=szm]] [--directories=mvelet] [--label] [--line-buffered]\n" +6 "\t[--null] [minta] [fjl ...]\n" +7 "%s binris fjl illeszkedik\n" +8 "%s (BSD grep) %s\n" +9 "%s (BSD grep, GNU compatible) %s\n" Modified: head/usr.bin/grep/nls/ja_JP.SJIS.msg ============================================================================== --- head/usr.bin/grep/nls/ja_JP.SJIS.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/ja_JP.SJIS.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -3,12 +3,11 @@ $ $set 1 $quote " 1 "(W)" -2 "bzip2 kt@CǂݍނƂł܂" -3 "%s IvV̎wlɌ肪܂" -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 "oCit@C %s Ƀ}b`܂\n" -9 "%s (BSD grep) %s\n" -10 "%s (BSD grep, GNU compatible) %s\n" +2 "%s IvV̎wlɌ肪܂" +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 "oCit@C %s Ƀ}b`܂\n" +8 "%s (BSD grep) %s\n" +9 "%s (BSD grep, GNU compatible) %s\n" Modified: head/usr.bin/grep/nls/ja_JP.UTF-8.msg ============================================================================== --- head/usr.bin/grep/nls/ja_JP.UTF-8.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/ja_JP.UTF-8.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -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" Modified: head/usr.bin/grep/nls/ja_JP.eucJP.msg ============================================================================== --- head/usr.bin/grep/nls/ja_JP.eucJP.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/ja_JP.eucJP.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -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" Modified: head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg ============================================================================== --- head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/pt_BR.ISO8859-1.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -3,12 +3,11 @@ $ $set 1 $quote " 1 "(entrada padro)" -2 "no se posso ler o fichero comprimido bzip2" -3 "opco no conhecida de %s" -4 "uso: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZz] [-A num] [-B num] [-C[num]]\n" -5 "\t[-e padro] [-f arquivo] [--binary-files=valor] [--color=quando]\n" -6 "\t[--context[=num]] [--directories=ao] [--label] [--line-buffered]\n" -7 "\t[--null] [padro] [arquivo ...]\n" -8 "arquivo binrio %s casa com o padro\n" -9 "%s (BSD grep) %s\n" -10 "%s (BSD grep, GNU compatible) %s\n" +2 "opco no conhecida de %s" +3 "uso: %s [-abcDEFGHhIiLlmnOoPqRSsUVvwxz] [-A num] [-B num] [-C[num]]\n" +4 "\t[-e padro] [-f arquivo] [--binary-files=valor] [--color=quando]\n" +5 "\t[--context[=num]] [--directories=ao] [--label] [--line-buffered]\n" +6 "\t[--null] [padro] [arquivo ...]\n" +7 "arquivo binrio %s casa com o padro\n" +8 "%s (BSD grep) %s\n" +9 "%s (BSD grep, GNU compatible) %s\n" Modified: head/usr.bin/grep/nls/ru_RU.KOI8-R.msg ============================================================================== --- head/usr.bin/grep/nls/ru_RU.KOI8-R.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/ru_RU.KOI8-R.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -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" Modified: head/usr.bin/grep/nls/uk_UA.UTF-8.msg ============================================================================== --- head/usr.bin/grep/nls/uk_UA.UTF-8.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/uk_UA.UTF-8.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -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" Modified: head/usr.bin/grep/nls/zh_CN.UTF-8.msg ============================================================================== --- head/usr.bin/grep/nls/zh_CN.UTF-8.msg Wed Apr 25 15:39:36 2018 (r332999) +++ head/usr.bin/grep/nls/zh_CN.UTF-8.msg Wed Apr 25 15:41:50 2018 (r333000) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804251541.w3PFfoXG006806>