aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-12-05 04:20:47 +0000
committerDavid Shaw <[email protected]>2003-12-05 04:20:47 +0000
commit7c01f154943038029c9ba5bf7144f8d73adae40b (patch)
tree40df304085d8f82fe8e0ae8b5004198337d62008
parent* config.links: Show target in asm-syntax.h file and include targets for (diff)
downloadgnupg-7c01f154943038029c9ba5bf7144f8d73adae40b.tar.gz
gnupg-7c01f154943038029c9ba5bf7144f8d73adae40b.zip
* 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.
Diffstat (limited to '')
-rw-r--r--util/ChangeLog7
-rw-r--r--util/miscutil.c10
2 files changed, 12 insertions, 5 deletions
diff --git a/util/ChangeLog b/util/ChangeLog
index 8675faf5f..be47a0a1e 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-04 David Shaw <[email protected]>
+
+ * 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 <[email protected]>
* miscutil.c (match_multistr): New. Match against each segment in
diff --git a/util/miscutil.c b/util/miscutil.c
index 512bac64c..00805111f 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");