diff --git a/monkeysign/cli.py b/monkeysign/cli.py index b17206af72c84ca4e1d4f95da5d7c010f0f465e6..a72cc564216923c26795fed2c80b400c469b7709 100644 --- a/monkeysign/cli.py +++ b/monkeysign/cli.py @@ -35,7 +35,7 @@ passwords.""" # override default options to allow passing a keyid usage = _('%prog [options] <keyid>') - epilog = _('<keyid>: a GPG fingerprint or key id') + epilog = _('<keyid>: a OpenPGP fingerprint or key id') def parse_args(self, args): """override main parsing: we absolutely need an argument""" diff --git a/monkeysign/gtkui.py b/monkeysign/gtkui.py index 5c6ab495c917585a5cca4a1256374ad5f3fc34fa..52590c89b4cc05affdc4f5c6a27cc1954b87ff84 100644 --- a/monkeysign/gtkui.py +++ b/monkeysign/gtkui.py @@ -266,7 +266,7 @@ class MonkeysignScan(gtk.Window): swin = gtk.ScrolledWindow() swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) swin.add_with_viewport(self.qrcode) - label = gtk.Label(_('This is a QR-code version of your PGP fingerprint. Scan this with another monkeysign to transfer your fingerprint.')) + label = gtk.Label(_('This is a QR-code version of your OpenPGP fingerprint. Scan this with another Monkeysign to transfer your fingerprint.')) label.set_line_wrap(True) self.qrcodewidget.pack_start(label, False) self.qrcodewidget.pack_start(swin) diff --git a/monkeysign/ui.py b/monkeysign/ui.py index e52cbb48460af8efa8110754b06a64f6ae08ff97..8865aeb54b70f767f76b82dd3dc4d1a23460f5ad 100644 --- a/monkeysign/ui.py +++ b/monkeysign/ui.py @@ -266,7 +266,7 @@ work. # export public key material associated with detected private if not self.tmpkeyring.import_data(self.keyring.export_data(self.signing_key.fpr)): - self.abort(_('could not find public key material, do you have a GPG key?')) + self.abort(_('could not find public key material, do you have an OpenPGP key?')) def sign_key(self): """sign the key uids, as specified""" @@ -393,8 +393,8 @@ mail. # the email body body = _(""" -Please find attached your signed PGP key. You can import the signed -key by running each through `gpg --import`. +Please find attached your signed OpenPGP key. You can import the +signed key by running each through `gpg --import`. If you have multiple user ids, each signature was sent in a separate email to each user id. @@ -491,7 +491,7 @@ mailto: who to send the mail to (usually similar to recipient, but can be used t keypart = MIMEBase('application', 'pgp-keys', name=filename) keypart.add_header('Content-Disposition', 'attachment', filename=filename) keypart.add_header('Content-Transfer-Encoding', '7bit') - keypart.add_header('Content-Description', (_('signed PGP Key %s, uid %s') % (self.keyfpr, self.recipient.decode('utf-8')))) + keypart.add_header('Content-Description', (_('signed OpenPGP Key %s, uid %s') % (self.keyfpr, self.recipient.decode('utf-8')))) keypart.set_payload(self.tmpkeyring.export_data(self.keyfpr)) return MIMEMultipart('mixed', None, [text, keypart]) @@ -504,7 +504,7 @@ mailto: who to send the mail to (usually similar to recipient, but can be used t p2.add_header('Content-Transfer-Encoding', '7bit') p2.set_payload(encrypted) msg = MIMEMultipart('encrypted', None, [p1, p2], protocol="application/pgp-encrypted") - msg.preamble = _('This is a multi-part message in PGP/MIME format...') + msg.preamble = _('This is a multi-part message in OpenPGP/MIME format...') msg['Subject'] = Header(self.subject.encode('utf-8'), 'UTF-8').encode() name, address = parseaddr(self.mailfrom) msg['From'] = formataddr((Header(name.encode('utf-8'), 'UTF-8').encode(), address))