From 65c7837e34bd8fd55ec8788b1d351542bc6fd768 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Fri, 31 Oct 2008 19:42:51 -0400
Subject: [PATCH] Use "passphrase" instead of "password" in visable strings.

---
 libpwmd.c | 10 +++++-----
 pwmc.c    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libpwmd.c b/libpwmd.c
index 2a63c3ea..cbf6a155 100644
--- a/libpwmd.c
+++ b/libpwmd.c
@@ -498,17 +498,17 @@ static gpg_error_t set_pinentry_strings(pwm_t *pwm, int which)
 	pwm->title = xstrdup(N_("LibPWMD"));
 
     if (!pwm->prompt)
-	pwm->prompt = xstrdup(N_("Password:"));
+	pwm->prompt = xstrdup(N_("Passphrase:"));
 
     if (!pwm->desc && !which)
-	pwm->desc = xstrdup(N_("Enter a password."));
+	pwm->desc = xstrdup(N_("Enter a passphrase."));
 
     if (which == 1) {
-	snprintf(tmp, sizeof(tmp), "SETERROR %s", N_("Invalid password, please try again."));
+	snprintf(tmp, sizeof(tmp), "SETERROR %s", N_("Invalid passphrase, please try again."));
 	buf = xstrdup(tmp);
     }
     else if (which == 2) {
-	snprintf(tmp, sizeof(tmp), "SETERROR %s", N_("Please type the password again for confirmation."));
+	snprintf(tmp, sizeof(tmp), "SETERROR %s", N_("Please type the passphrase again for confirmation."));
 	buf = xstrdup(tmp);
     }
     else {
@@ -1012,7 +1012,7 @@ gotpassword:
     if (*error == EPWMD_BADKEY) {
 	if (pin_try-- > 0 && !nb) {
 	    *error = pwmd_command(pwm, &result, "OPTION TITLE=%s",
-		    N_("Invalid password, please try again."));
+		    N_("Invalid passphrase, please try again."));
 
 	    if (*error)
 		return 1;
diff --git a/pwmc.c b/pwmc.c
index 936a79cd..1e4e0f3d 100644
--- a/pwmc.c
+++ b/pwmc.c
@@ -65,7 +65,7 @@ static void usage(const char *pn)
 #ifdef DEBUG
 	    "[-E <n>] [-y <n>]"
 #endif
-	    "[-PTND <string>] [-p <password>]\n"
+	    "[-PTND <string>] [-p <passphrase>]\n"
 	    "            [-S [-i <iter>]] [-c <name>] [-t <n>] [-d <fd>] [-I <fd>]\n"
 	    "            [filename]\n"
 #ifdef DEBUG
@@ -76,7 +76,7 @@ static void usage(const char *pn)
 	    "   -X  disable showing of status messages from the server\n"
 	    "   -c  set the client name\n"
 	    "   -s  socket path (~/.pwmd/socket)\n"
-	    "   -p  password\n"
+	    "   -p  passphrase\n"
 	    "   -P  path to the pinentry binary (server default)\n"
 	    "   -T  pinentry tty\n"
 	    "   -N  pinentry terminal type\n"
-- 
2.11.4.GIT