Spelling: correct spelling of "passphrase".

There were several different variant spellings of "passphrase".  This
should fix them all for all English text.

I did notice that po/it.po contains multiple instances of
"passhprase", which also looks suspect to me, but i do not know
Italian, so i did not try to correct it.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>

NEWS

@@ -343,7 +343,7 @@ Noteworthy changes in version 2.1.9 (2015-10-09)
 
  * agent: Fix ssh fingerprint computation for nistp384 and EdDSA.
 
- * agent: Fix crash during passprase entry on some platforms.
+ * agent: Fix crash during passphrase entry on some platforms.
 
  * scd: Change timeout to fix problems with some 2.1 cards.
 

agent/agent.h

@@ -122,7 +122,7 @@ struct
 
   /* If set, a passphrase history will be written and checked at each
      passphrase change.  */
-  int enable_passhrase_history;
+  int enable_passphrase_history;
 
   int running_detached; /* We are running detached from the tty. */
 

agent/gpg-agent.c

@@ -789,7 +789,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.min_passphrase_nonalpha = MIN_PASSPHRASE_NONALPHA;
       opt.check_passphrase_pattern = NULL;
       opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
-      opt.enable_passhrase_history = 0;
+      opt.enable_passphrase_history = 0;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 1;
       opt.allow_external_cache = 1;
@@ -856,7 +856,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.max_passphrase_days = pargs->r.ret_ulong;
       break;
     case oEnablePassphraseHistory:
-      opt.enable_passhrase_history = 1;
+      opt.enable_passphrase_history = 1;
       break;
 
     case oIgnoreCacheForSigning: opt.ignore_cache_for_signing = 1; break;

doc/help.be.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.ca.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.cs.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.da.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.el.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.eo.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.et.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.gl.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.nb.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.sv.txt

@@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
 
 .#gpg.passphrase.enter
 # fixme: Please translate and remove the hash mark from the key line.
-Please enter the passhrase; this is a secret sentence 
+Please enter the passphrase; this is a secret sentence
 
 .
 

doc/help.txt

@@ -312,7 +312,7 @@ self-signatures will be advanced by one second.
 .gpg.passphrase.enter
 # (keep a leading empty line)
 
-Please enter the passhrase; this is a secret sentence.
+Please enter the passphrase; this is a secret sentence.
 .
 
 

g10/ChangeLog-2011

@@ -8210,7 +8210,7 @@
 	to all foo-fd options.
 	* gpgv.c, openfile.c, ringedit.c, tdbio.c: Minor fixes.  Mainly
 	replaced hardcoded path	separators with EXTSEP_S like macros.
-	* passprase.c [__riscos__]: Disabled agent stuff
+	* passphrase.c [__riscos__]: Disabled agent stuff
 	* trustdb.c (check_trust): Changed r_trustlevel to signed int to
 	avoid mismatch problems in pkclist.c
 	* pkclist.c (add_ownertrust): Ditto.
@@ -11583,7 +11583,7 @@ Mon May  4 09:35:53 1998  Werner Koch  (wk@isil.d.shuttle.de)
 	changed all callers.
 
 	* passphrase.c (make_dek_from_passphrase): Removed
-	* (get_passhrase_hash): Changed name to passphrase_to_dek, add arg,
+	* (get_passphrase_hash): Changed name to passphrase_to_dek, add arg,
 	changed all callers.
 
 	* all: Introduced the new ELG identifier and added support for the

po/ca.po

@@ -9798,7 +9798,7 @@ msgstr ""
 #~ "a la llista actual de preferències. Les marques de temps de totes les\n"
 #~ "autosignatures afectades s'avançaran un segon.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
 #~ msgid ""

po/cs.po

@@ -9669,7 +9669,7 @@ msgstr ""
 #~ "na aktuální seznam předvoleb. Časová razítka všech dotčených podpisů\n"
 #~ "klíčů jimi samotnými budou posunuty o jednu vteřinu dopředu.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Prosím, vložte heslo; toto je tajná věta \n"
 
 #~ msgid ""

po/de.po

@@ -9616,7 +9616,7 @@ msgstr ""
 #~ "betroffenen\n"
 #~ "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
 
 #~ msgid ""

po/el.po

@@ -9605,7 +9605,7 @@ msgstr ""
 #~ "στην προυπάρχουσα λίστα προεπιλογών.  Η ημερομηνία όλων των επηρεασμένων\n"
 #~ "ιδιο-υπογραφών θα αυξηθεί κατά 1 δευτερόλεπτο.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Πληκτρολογήστε τη φράση κλειδί· αυτή είναι μια μυστική πρόταση \n"
 
 #~ msgid ""

po/eo.po

@@ -9488,7 +9488,7 @@ msgstr ""
 #~ "al la aktuala listo de preferoj. La dato de ĉiuj trafitaj\n"
 #~ "mem-subskriboj estos antaŭenigitaj je unu sekundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
 #~ msgid ""

po/es.po

@@ -9955,7 +9955,7 @@ msgstr ""
 #~ "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 #~ "de todas las autofirmas afectadas se avanzará en un segundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Por favor introduzca la contraseña: una frase secreta \n"
 
 #~ msgid ""

po/et.po

@@ -9492,7 +9492,7 @@ msgstr ""
 #~ "vastavaks hetkel määratud seadetele. Kõikide asjasse puutuvate\n"
 #~ "ise loodud allkirjade ajatempleid suurendatakse ühe sekundi võrra.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Palun sisestage parool; see on salajane tekst \n"
 
 #~ msgid ""

po/fi.po

@@ -9584,7 +9584,7 @@ msgstr ""
 #~ "nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
 #~ "oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
 #~ msgid ""

po/gl.po

@@ -9605,7 +9605,7 @@ msgstr ""
 #~ "sinaturas\n"
 #~ "afectadas ha avanzar un segundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
 #~ msgid ""

po/hu.po

@@ -9548,7 +9548,7 @@ msgstr ""
 #~ "tartozó preferenciákat az aktuális preferenciákra. Minden érintett\n"
 #~ "önaláírás időpontját egy másodperccel növeli.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
 #~ msgid ""

po/id.po

@@ -9540,7 +9540,7 @@ msgstr ""
 #~ "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 #~ "yang terpengaruh akan bertambah satu detik.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
 #~ msgid ""

po/it.po

@@ -9599,7 +9599,7 @@ msgstr ""
 #~ "coinvolte\n"
 #~ "sarà aumentato di un secondo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Inserisci la passphrase, cioè una frase segreta \n"
 
 #~ msgid ""

po/pt.po

@@ -9532,7 +9532,7 @@ msgstr ""
 #~ "O 'timestamp' de todas as auto-assinaturas afectuadas será avançado\n"
 #~ "em um segundo.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Por favor digite a frase secreta \n"
 
 #~ msgid ""

po/ro.po

@@ -9639,7 +9639,7 @@ msgstr ""
 #~ "cele selectate) conform cu lista curentă de preferinţe.  Timestamp-urile\n"
 #~ "tuturor auto-semnăturilor afectate vor fi avansate cu o secundă.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr ""
 #~ "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 

po/sk.po

@@ -9564,7 +9564,7 @@ msgstr ""
 #~ "podpisov\n"
 #~ "kľúčov nimi samotnými budú posunuté o jednu sekundu dopredu.\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
 #~ msgid ""

po/zh_CN.po

@@ -9408,7 +9408,7 @@ msgstr ""
 #~ "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n"
 #~ "字的时间戳都会增加一秒钟。\n"
 
-#~ msgid "Please enter the passhrase; this is a secret sentence \n"
+#~ msgid "Please enter the passphrase; this is a secret sentence \n"
 #~ msgstr "请输入密码：这是一个秘密的句子 \n"
 
 #~ msgid ""

scd/app-nks.c

@@ -1068,7 +1068,7 @@ do_decipher (app_t app, const char *keyidstr,
 
 
 /* Parse a password ID string.  Returns NULL on error or a string
-   suitable as passpahrse prompt on success.  On success stores the
+   suitable as passphrase prompt on success.  On success stores the
    reference value for the password at R_PWID and a flag indicating
    that the SigG application is to be used at R_SIGG.  If NEW_MODE is
    true, the returned description is suitable for a new Password.

tests/openpgp/ecc.scm

@@ -187,7 +187,7 @@ Rg==
 ;;
 ;; Now check that we can encrypt and decrypt our own messages.
 ;;
-;; Note that we don't need to provide a passppharse because we already
+;; Note that we don't need to provide a passphrase because we already
 ;; preset the passphrase into the gpg-agent.
 ;;
 (for-each-p