Date: Fri, 6 Mar 2009 22:00:09 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 158803 for review Message-ID: <200903062200.n26M0932085660@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=158803 Change 158803 by gabor@gabor_server on 2009/03/06 21:59:39 - Clean up of NLS catalogs Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#18 edit .. //depot/projects/soc2008/gabor_textproc/grep/file.c#40 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#82 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#6 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#6 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#18 (text+ko) ==== @@ -27,7 +27,8 @@ .endif .if !defined(WITHOUT_NLS) -NLS= hu_HU.ISO8859-2 +NLS= es_ES.ISO8859-1 +NLS+= hu_HU.ISO8859-2 NLS+= pt_BR.ISO8859-1 NLSSRCFILES= ${NLS:S@$@.msg@} .for lang in ${NLS} ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#40 (text+ko) ==== @@ -86,7 +86,7 @@ if (bzerr == BZ_STREAM_END) return (-1); else if (bzerr != BZ_SEQUENCE_ERROR && bzerr != BZ_OK) - errx(2, getstr(16)); + errx(2, getstr(2)); return (c); } return (-1); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#82 (text+ko) ==== @@ -64,21 +64,17 @@ char *errstr[] = { "", /* 1*/ "(standard input)", -/* 2*/ "(fd %d)", -/* 3*/ "invalid file type", +/* 2*/ "cannot read bzip2 compressed file", +/* 3*/ "unknown --color option", /* 4*/ "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-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*/ "parentheses not balanced", +/* 8*/ "value out of range", /* 9*/ "context out of range", /*10*/ "%s (BSD grep) %s\n", /*11*/ "unknown --binary-files option", -/*12*/ "Binary file %s matches\n", -/*13*/ "value out of range", -/*14*/ "unknown -d or --directory option", -/*15*/ "unknown --color option", -/*16*/ "cannot read bzip2 compressed file", +/*12*/ "Binary file %s matches\n" }; /* Flags passed to regcomp() and regexec() */ @@ -421,7 +417,7 @@ } else if (strcmp("skip", optarg) == 0) dirbehave = DIR_SKIP; else if (strcmp("read", optarg) != 0) - errx(2, getstr(13)); + errx(2, getstr(8)); break; case 'E': grepbehave = GREP_EXTENDED; @@ -470,7 +466,7 @@ mflag++; mcount = strtoull(optarg, (char **)NULL, 10); if ((errno == ERANGE) && (mcount == ULLONG_MAX)) - err(2, getstr(13)); + err(2, getstr(8)); break; case 'n': nflag = 1; @@ -540,7 +536,7 @@ } else if (strcmp("never", optarg) == 0) color = NULL; else - errx(2, getstr(15)); + errx(2, getstr(3)); break; case LABEL_OPT: label = optarg; ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#7 (text+ko) ==== @@ -3,19 +3,14 @@ $set 1 $quote " 1 "(standard input)" -2 "(fd %d)" -3 "invalid file type" +2 "cannot read bzip2 compressed file" +3 "unknown --color option" 4 "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-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 "parentheses not balanced" +8 "value out of range" 9 "context out of range" 10 "%s (BSD grep) %s\n" 11 "unknown --binary-files option" 12 "Binary file %s matches\n" -13 "value out of range" -14 "unknown -d or --directory option" -15 "unknown --color option" -16 "cannot read bzip2 compressed file" -17 "PCRE is not enabled in this version of grep. To enable this feature, please install libpcre and recompile grep with WITH_PCRE set." ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#6 (text+ko) ==== @@ -3,19 +3,14 @@ $set 1 $quote " 1 "(szabványos bemenet)" -2 "(fájlleíró %d)" -3 "érvénytelen fájltípus" +2 "bzip2 tömörített fájl nem olvasható" +3 "ismeretlen --color opció" 4 "használat: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-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 "párosítatlan zárójelek" +8 "az érték a megengedett tartományon kívül esik" 9 "a kontextus a megengedett tartományon kívül esik" 10 "%s (BSD grep) %s\n" 11 "ismeretlen --binary-files opció" 12 "%s bináris fájl illeszkedik\n" -13 "az érték a megengedett tartományon kívül esik" -14 "ismeretlen -d vagy --directory opció" -15 "ismeretlen --color opció" -16 "bzip2 tömörített fájl nem olvasható" -17 "A PCRE nem aktivált a grep ezen verziójában. A funkció aktiválásához kérjük telepítse a libpcre könyvtárat és fordítsa újra a grep programot a WITH_PCRE opcióval." ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#6 (text+ko) ==== @@ -3,18 +3,14 @@ $set 1 $quote " 1 "(entrada padrăo)" -2 "(fd %d)" -3 "tipo de arquivo inválido" +2 "năo se posso ler o fichero comprimido bzip2" +3 "opcăo năo conhecida de --color" 4 "uso: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-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 "paręnteses nâo balanceados" +8 "el valor está fora da escala" 9 "contexto está fora da escala" 10 "%s (BSD grep) %s\n" 11 "opcăo năo conhecida de --binary-files" 12 "arquivo binário %s casa com o padrăo\n" -13 "el valor está fora da escala" -14 "opcăo năo conhecida de -d ou --directory" -15 "opcăo năo conhecida de --color" -16 "năo se posso ler o fichero comprimido bzip2"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903062200.n26M0932085660>