diff --git a/util/ChangeLog b/util/ChangeLog index 78ded44bf..e164ed691 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2003-12-03 David Shaw + + * miscutil.c (answer_is_yes_no_default, answer_is_yes_no_quit): + Don't use alternate strings when not needed so we don't have to + re-translate them. Hopefully the comment will be enough to + indicate multiple match strings. + 2003-11-20 David Shaw * miscutil.c (match_multistr): New. Match against each segment in diff --git a/util/miscutil.c b/util/miscutil.c index 0ae259df4..e6cc9a860 100644 --- a/util/miscutil.c +++ b/util/miscutil.c @@ -294,10 +294,10 @@ int answer_is_yes_no_default( const char *s, int def_answer ) { /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ - const char *long_yes = _("yes|yes"); + const char *long_yes = _("yes"); const char *short_yes = _("yY"); /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ - const char *long_no = _("no|no"); + const char *long_no = _("no"); const char *short_no = _("nN"); /* Note: we have to use the local dependent strcasecmp here */ @@ -331,11 +331,11 @@ int answer_is_yes_no_quit( const char *s ) { /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ - const char *long_yes = _("yes|yes"); + const char *long_yes = _("yes"); /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ - const char *long_no = _("no|no"); + const char *long_no = _("no"); /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */ - const char *long_quit = _("quit|quit"); + const char *long_quit = _("quit"); const char *short_yes = _("yY"); const char *short_no = _("nN"); const char *short_quit = _("qQ");