Since almost all CS vocabulary was removed from manual pages as pointed
in #325169, the only remaining parts seems to be in the program
messages. This patch address this issue in the program messages, and
I'll provide the remaining fixes in manual pages as a follow up to
#615621 once this patch has been reviewed and committed.
---
grep-dctrl/grep-dctrl.c | 32 ++++++++++++++++----------------
lib/predicate.c | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/grep-dctrl/grep-dctrl.c b/grep-dctrl/grep-dctrl.c
index 4f26168..38f3b02 100644
--- a/grep-dctrl/grep-dctrl.c
+++ b/grep-dctrl/grep-dctrl.c
@@ -46,7 +46,7 @@ struct field_attr *description_attr;
static char progdoc [] = N_("grep-dctrl -- grep Debian control files");
-static char argsdoc [] = "PREDICATE [FILENAME...]";
+static char argsdoc [] = N_("FILTER [FILENAME...]");
enum {
OPT_CONFIG=256,
@@ -109,7 +109,7 @@ static struct argp_option options[] = {
#ifdef BANNER
{ "banner", 'B', 0, 0, N_("Show the testing
banner.") },
#endif
- { "errorlevel", 'l', N_("LEVEL"), 0, N_("Set debugging level
to LEVEL.") },
+ { "errorlevel", 'l', N_("LEVEL"), 0, N_("Set log level to
LEVEL.") },
{ "field", 'F', N_("FIELD,FIELD,..."), 0, N_("Restrict pattern
matching to the FIELDs given.") },
{ 0, 'P', 0, 0, N_("This is a shorthand
for -FPackage.") },
{ 0, 'S', 0, 0, N_("This is a shorthand
for -FSource:Package.") },
@@ -117,7 +117,7 @@ static struct argp_option options[] = {
{ 0, 'd', 0, 0, N_("Show only the first
line of the \"Description\" field from the matching paragraphs.") },
{ "no-field-names", 'n', 0, 0, N_("Suppress field names
when showing specified fields.") },
{ "eregex", 'e', 0, 0, N_("Regard the pattern
as an extended POSIX regular expression.") },
- { "regex", 'r', 0, 0, N_("The pattern is a
standard POSIX regular expression.") },
+ { "regex", 'r', 0, 0, N_("Regard the pattern
as a standard POSIX regular expression.") },
{ "ignore-case", 'i', 0, 0, N_("Ignore case when
looking for a match.") },
{ "invert-match", 'v', 0, 0, N_("Show only paragraphs
that do not match.") },
{ "invert-show", 'I', 0, 0, N_("Show those fields
that have NOT been selected with -s") },
@@ -125,9 +125,9 @@ static struct argp_option options[] = {
{ "config-file", OPT_CONFIG, N_("FNAME"),0, N_("Use FNAME as the
config file.") },
{ "exact-match", 'X', 0, 0, N_("Do an exact match.")
},
{ "copying", 'C', 0, 0, N_("Print out the
copyright license.") },
- { "and", 'a', 0, 0, N_("Conjunct
predicates.") },
- { "or", 'o', 0, 0, N_("Disjunct
predicates.") },
- { "not", '!', 0, 0, N_("Negate the following
predicate.") },
+ { "and", 'a', 0, 0, N_("Conjunct filters.")
},
+ { "or", 'o', 0, 0, N_("Disjunct filters.")
},
+ { "not", '!', 0, 0, N_("Negate the following
filters.") },
{ "eq", OPT_EQ, 0, 0, N_("Test for version
number equality.") },
{ "lt", OPT_LT, 0, 0, N_("Version number
comparison: <.") },
{ "le", OPT_LE, 0, 0, N_("Version number
comparison: <=.") },
@@ -225,7 +225,7 @@ struct arguments {
struct atom * clone_atom(struct arguments * args)
{
if (args->p.num_atoms >= MAX_ATOMS) {
- message(L_FATAL, 0, _("predicate is too complex"));
+ message(L_FATAL, 0, _("filter is too complex"));
fail();
}
int oa = args->p.num_atoms-1;
@@ -301,14 +301,14 @@ static void apptok(struct arguments * args, const int tok)
debug_message("apptok", 0);
if (args->finished) {
message(L_FATAL, 0,
- _("file names are not allowed within the predicate"));
+ _("file names are not allowed within the filter"));
fail();
}
if (args->in_atom && tok < TOK_ATOM_BASE) {
finish_atom(args);
}
if (args->toks_np >= MAX_TOKS) {
- message(L_FATAL, 0, _("predicate is too long"));
+ message(L_FATAL, 0, _("filter is too long"));
fail();
}
args->toks[args->toks_np++] = tok;
@@ -340,7 +340,7 @@ static struct atom * enter_atom(struct arguments * args)
}
args->in_atom = true;
if (args->p.num_atoms >= MAX_ATOMS) {
- message(L_FATAL, 0, _("predicate is too complex"));
+ message(L_FATAL, 0, _("filter is too complex"));
fail();
}
APPTOK(args->p.num_atoms + TOK_ATOM_BASE);
@@ -368,7 +368,7 @@ static struct atom * enter_atom(struct arguments * args)
#define set_mode(nmode) do { \
atom = ENTER_ATOM; \
if (atom->mode != M_SUBSTR) { \
- message(L_FATAL, 0, _("inconsistent atom modifiers")); \
+ message(L_FATAL, 0, _("inconsistent modifiers of simple
filters")); \
fail(); \
} \
atom->mode = (nmode); \
@@ -546,7 +546,7 @@ static error_t parse_opt (int key, char * arg, struct
argp_state * state)
atom = ENTER_ATOM;
if (atom->pat != 0) {
message(L_FATAL, 0, _("Multiple patterns for the same "
- "atom are not allowed"));
+ "simple filter are not
allowed"));
fail();
}
atom->patlen = strlen(arg);
@@ -673,7 +673,7 @@ static void unexpected(int tok)
{
switch (tok) {
case TOK_EOD:
- message(L_FATAL, 0, _("unexpected end of predicate"));
+ message(L_FATAL, 0, _("unexpected end of filter"));
fail();
case TOK_NOT:
message(L_FATAL, 0, _("unexpected '!' in command line"));
@@ -692,7 +692,7 @@ static void unexpected(int tok)
fail();
default:
assert(tok >=TOK_ATOM_BASE);
- message(L_FATAL, 0, _("unexpected atom in command line"));
+ message(L_FATAL, 0, _("unexpected simple filter in command
line"));
fail();
}
}
@@ -824,12 +824,12 @@ int main (int argc, char * argv[])
if (debug_optparse) { dump_args(&args); return 0; }
if (args.p.num_atoms == 0) {
- message(L_FATAL, 0, _("a predicate is required"));
+ message(L_FATAL, 0, _("a filter is required"));
fail();
}
if (!check_predicate(&args.p)) {
- message(L_FATAL, 0, _("malformed predicate"));
+ message(L_FATAL, 0, _("malformed filter"));
fail();
}
diff --git a/lib/predicate.c b/lib/predicate.c
index 5c213b2..593a951 100644
--- a/lib/predicate.c
+++ b/lib/predicate.c
@@ -40,7 +40,7 @@ void addinsn(struct predicate * p, int insn)
{
if (insn == I_NOP) return;
if (p->proglen >= MAX_OPS) {
- message(L_FATAL, 0, _("predicate is too complex"));
+ message(L_FATAL, 0, _("filter is too complex"));
fail();
}
p->program[p->proglen++] = insn;
--
1.7.4.1
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
