aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-09-07 16:49:10 +0000
committerWerner Koch <[email protected]>2004-09-07 16:49:10 +0000
commiteda1b80760b0629bdb7e0c758e7b37913a829083 (patch)
treeff856368f99bdb5081a4b505f20519f9e26bb66a
parent* keyserver.c (parse_keyrec): Force the 'e'xpired flag on as soon as we (diff)
downloadgnupg-eda1b80760b0629bdb7e0c758e7b37913a829083.tar.gz
gnupg-eda1b80760b0629bdb7e0c758e7b37913a829083.zip
(generate_photo_id): Use tty_printf and not just
printf. Put _() around one string.
Diffstat (limited to '')
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/photoid.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2af9c26c5..03b8b39dd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07 Werner Koch <[email protected]>
+
+ * photoid.c (generate_photo_id): Use tty_printf and not just
+ printf. Put _() around one string.
+
2004-09-03 David Shaw <[email protected]>
* keyserver.c (parse_keyrec): Force the 'e'xpired flag on as soon
diff --git a/g10/photoid.c b/g10/photoid.c
index 055a076be..aa9607205 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -62,8 +62,8 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
#define EXTRA_UID_NAME_SPACE 71
uid=m_alloc_clear(sizeof(*uid)+71);
- printf(_("\nPick an image to use for your photo ID. "
- "The image must be a JPEG file.\n"
+ tty_printf(_("\nPick an image to use for your photo ID. "
+ "The image must be a JPEG file.\n"
"Remember that the image is stored within your public key. "
"If you use a\n"
"very large picture, your key will become very large as well!\n"
@@ -71,7 +71,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
while(photo==NULL)
{
- printf("\n");
+ tty_printf("\n");
m_free(filename);
@@ -92,7 +92,7 @@ PKT_user_id *generate_photo_id(PKT_public_key *pk)
len=iobuf_get_filelength(file);
if(len>6144)
{
- printf("This JPEG is really large (%d bytes) !\n",len);
+ tty_printf( _("This JPEG is really large (%d bytes) !\n"),len);
if(!cpr_get_answer_is_yes("photoid.jpeg.size",
_("Are you sure you want to use it (y/N)? ")))
{