aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/openpgp-utils.c12
2 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4ea2c51312..792e4ab766 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-16 Jason Leach <jasonleach@usa.net>
+
+ * openpgp-utils.c (pgp_get_passphrase): Fix a string causing
+ translation problems. Bug #1147.
+
2001-01-16 Not Zed <NotZed@Ximian.com>
* mail-ops.c (mail_do_fetch_mail): Setup a cancellation handle.
diff --git a/mail/openpgp-utils.c b/mail/openpgp-utils.c
index 1240a68188..58585fceef 100644
--- a/mail/openpgp-utils.c
+++ b/mail/openpgp-utils.c
@@ -73,10 +73,14 @@ pgp_get_passphrase (const gchar *userid)
default:
type = "";
}
- prompt = g_strdup_printf (_("Please enter your %s passphrase%s%s"),
- type, userid ? _(" for ") : "",
- userid ? userid : "");
-
+
+ if (userid)
+ prompt = g_strdup_printf (_("Please entry your %s passphrase for %s"),
+ type, userid);
+ else
+ prompt = g_strdup_printf (_("Please entry your %s passphrase"),
+ type);
+
passphrase = pgp_passwd_func (prompt, pgp_data);
g_free (prompt);