diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c index 76dde33cb..46b93ad46 100644 --- a/plugins/sudoers/toke.c +++ b/plugins/sudoers/toke.c @@ -3180,7 +3180,7 @@ YY_RULE_SETUP BEGIN prev_state; if (sudoerslval.string == NULL) { - sudoerserror("empty string"); + sudoerserror(N_("empty string")); LEXTRACE("ERROR "); return ERROR; } @@ -3190,7 +3190,7 @@ YY_RULE_SETUP if (sudoerslval.string[1] == '\0' || (sudoerslval.string[1] == ':' && sudoerslval.string[2] == '\0')) { - sudoerserror("empty group"); + sudoerserror(N_("empty group")); LEXTRACE("ERROR "); return ERROR; } @@ -3198,7 +3198,7 @@ YY_RULE_SETUP return USERGROUP; case '+': if (sudoerslval.string[1] == '\0') { - sudoerserror("empty netgroup"); + sudoerserror(N_("empty netgroup")); LEXTRACE("ERROR "); return ERROR; } @@ -3322,7 +3322,7 @@ YY_RULE_SETUP #line 292 "toke.l" { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -3337,7 +3337,7 @@ YY_RULE_SETUP #line 304 "toke.l" { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -3353,7 +3353,7 @@ YY_RULE_SETUP #line 316 "toke.l" { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -3373,7 +3373,7 @@ YY_RULE_SETUP #line 332 "toke.l" { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -3395,7 +3395,7 @@ YY_RULE_SETUP int n; if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -3438,7 +3438,7 @@ YY_RULE_SETUP int n; if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -3580,9 +3580,9 @@ YY_RULE_SETUP #line 488 "toke.l" { if (sudoerstext[0] == '+') - sudoerserror("empty netgroup"); + sudoerserror(N_("empty netgroup")); else - sudoerserror("empty group"); + sudoerserror(N_("empty group")); LEXTRACE("ERROR "); return ERROR; } @@ -3634,7 +3634,7 @@ YY_RULE_SETUP #line 527 "toke.l" { if (!ipv6_valid(sudoerstext)) { - sudoerserror("invalid IPv6 address"); + sudoerserror(N_("invalid IPv6 address")); LEXTRACE("ERROR "); return ERROR; } @@ -3649,7 +3649,7 @@ YY_RULE_SETUP #line 539 "toke.l" { if (!ipv6_valid(sudoerstext)) { - sudoerserror("invalid IPv6 address"); + sudoerserror(N_("invalid IPv6 address")); LEXTRACE("ERROR "); return ERROR; } @@ -3965,7 +3965,7 @@ YY_RULE_SETUP /* re-scan after changing state */ BEGIN INITIAL; sudoersless(0); - sudoerserror("unexpected line break in string"); + sudoerserror(N_("unexpected line break in string")); LEXTRACE("ERROR "); return ERROR; } @@ -4033,9 +4033,9 @@ case YY_STATE_EOF(EXPECTPATH): { if (YY_START != INITIAL) { if (YY_START == INSTR) - sudoerserror("unterminated string"); + sudoerserror(N_("unterminated string")); else - sudoerserror("unexpected state at EOF"); + sudoerserror(N_("unexpected state at end of file")); BEGIN INITIAL; LEXTRACE("ERROR "); return ERROR; diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l index 4ae3bbf85..95ab4ef13 100644 --- a/plugins/sudoers/toke.l +++ b/plugins/sudoers/toke.l @@ -177,7 +177,7 @@ DEFVAR [a-z_]+ BEGIN prev_state; if (sudoerslval.string == NULL) { - sudoerserror("empty string"); + sudoerserror(N_("empty string")); LEXTRACE("ERROR "); return ERROR; } @@ -187,7 +187,7 @@ DEFVAR [a-z_]+ if (sudoerslval.string[1] == '\0' || (sudoerslval.string[1] == ':' && sudoerslval.string[2] == '\0')) { - sudoerserror("empty group"); + sudoerserror(N_("empty group")); LEXTRACE("ERROR "); return ERROR; } @@ -195,7 +195,7 @@ DEFVAR [a-z_]+ return USERGROUP; case '+': if (sudoerslval.string[1] == '\0') { - sudoerserror("empty netgroup"); + sudoerserror(N_("empty netgroup")); LEXTRACE("ERROR "); return ERROR; } @@ -291,7 +291,7 @@ DEFVAR [a-z_]+ @include { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -303,7 +303,7 @@ DEFVAR [a-z_]+ @includedir { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -315,7 +315,7 @@ DEFVAR [a-z_]+ ^#include[[:blank:]]+.*(\r\n|\n)? { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -331,7 +331,7 @@ DEFVAR [a-z_]+ ^#includedir[[:blank:]]+.*(\r\n|\n)? { if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -350,7 +350,7 @@ DEFVAR [a-z_]+ int n; if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -390,7 +390,7 @@ DEFVAR [a-z_]+ int n; if (continued) { - sudoerserror("invalid line continuation"); + sudoerserror(N_("invalid line continuation")); LEXTRACE("ERROR "); return ERROR; } @@ -487,9 +487,9 @@ NOFOLLOW[[:blank:]]*: { (\+|\%|\%:) { if (sudoerstext[0] == '+') - sudoerserror("empty netgroup"); + sudoerserror(N_("empty netgroup")); else - sudoerserror("empty group"); + sudoerserror(N_("empty group")); LEXTRACE("ERROR "); return ERROR; } @@ -526,7 +526,7 @@ NOFOLLOW[[:blank:]]*: { {IPV6ADDR}(\/{IPV6ADDR})? { if (!ipv6_valid(sudoerstext)) { - sudoerserror("invalid IPv6 address"); + sudoerserror(N_("invalid IPv6 address")); LEXTRACE("ERROR "); return ERROR; } @@ -538,7 +538,7 @@ NOFOLLOW[[:blank:]]*: { {IPV6ADDR}\/([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8]) { if (!ipv6_valid(sudoerstext)) { - sudoerserror("invalid IPv6 address"); + sudoerserror(N_("invalid IPv6 address")); LEXTRACE("ERROR "); return ERROR; } @@ -762,7 +762,7 @@ sudoedit { /* re-scan after changing state */ BEGIN INITIAL; sudoersless(0); - sudoerserror("unexpected line break in string"); + sudoerserror(N_("unexpected line break in string")); LEXTRACE("ERROR "); return ERROR; } @@ -806,9 +806,9 @@ sudoedit { <*><> { if (YY_START != INITIAL) { if (YY_START == INSTR) - sudoerserror("unterminated string"); + sudoerserror(N_("unterminated string")); else - sudoerserror("unexpected state at EOF"); + sudoerserror(N_("unexpected state at end of file")); BEGIN INITIAL; LEXTRACE("ERROR "); return ERROR;