From e1025780de1c0b143542f2c66a1d2edd875d0019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Thu, 16 Oct 2014 23:46:07 -0400
Subject: [PATCH] uniform usage of OpenPGP instead of GPG or PGP
---
monkeysign/cli.py | 2 +-
monkeysign/gtkui.py | 2 +-
monkeysign/ui.py | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/monkeysign/cli.py b/monkeysign/cli.py
index b17206a..a72cc56 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 5c6ab49..52590c8 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 e52cbb4..8865aeb 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))
--
GitLab