From 18db38002bfb266e9c21ac929bb08d01a9b1149d Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Sun, 14 Feb 2016 13:35:48 -0500
Subject: [PATCH] monkeysphere: Consistently use the term OpenPGP

In user visible strings, instead of PGP or GPG.
---
 plinth/modules/monkeysphere/__init__.py              | 12 ++++++------
 .../modules/monkeysphere/templates/monkeysphere.html |  4 ++--
 plinth/modules/monkeysphere/views.py                 |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plinth/modules/monkeysphere/__init__.py b/plinth/modules/monkeysphere/__init__.py
index 09be4a195..d9c526f82 100644
--- a/plinth/modules/monkeysphere/__init__.py
+++ b/plinth/modules/monkeysphere/__init__.py
@@ -30,12 +30,12 @@ depends = ['system']
 title = _('Monkeysphere')
 
 description = [
-    _('With Monkeysphere, a PGP key can be generated for each configured '
-      'domain serving SSH. The PGP public key can then be uploaded to the PGP '
-      'keyservers. Users connecting to this machine through SSH can verify '
-      'that they are connecting to the correct host.  For users to trust the '
-      'key, at least one person (usually the machine owner) must sign the key '
-      'using the regular PGP key signing process.  See the '
+    _('With Monkeysphere, an OpenPGP key can be generated for each configured '
+      'domain serving SSH. The OpenPGP public key can then be uploaded to the '
+      'OpenPGP keyservers. Users connecting to this machine through SSH can '
+      'verify that they are connecting to the correct host.  For users to '
+      'trust the key, at least one person (usually the machine owner) must '
+      'sign the key using the regular OpenPGP key signing process.  See the '
       '<a href="http://web.monkeysphere.info/getting-started-ssh/"> '
       'Monkeysphere SSH documentation</a> for more details.')
 ]
diff --git a/plinth/modules/monkeysphere/templates/monkeysphere.html b/plinth/modules/monkeysphere/templates/monkeysphere.html
index ebe048590..58258c6c0 100644
--- a/plinth/modules/monkeysphere/templates/monkeysphere.html
+++ b/plinth/modules/monkeysphere/templates/monkeysphere.html
@@ -53,7 +53,7 @@
         <thead>
           <tr>
             <th>{% trans "Domain" %}</th>
-            <th>{% trans "GPG Fingerprint" %}</th>
+            <th>{% trans "OpenPGP Fingerprint" %}</th>
             <th>{% trans "Actions" %}</th>
           </tr>
         </thead>
@@ -75,7 +75,7 @@
                     {% csrf_token %}
 
                     <button type="submit" class="btn btn-primary btn-sm pull-right">
-                      {% trans "Generate PGP Key" %}</button>
+                      {% trans "Generate OpenPGP Key" %}</button>
                   </form>
                 {% elif not running %}
                   <form class="form" method="post"
diff --git a/plinth/modules/monkeysphere/views.py b/plinth/modules/monkeysphere/views.py
index 2ce31d22d..012a198de 100644
--- a/plinth/modules/monkeysphere/views.py
+++ b/plinth/modules/monkeysphere/views.py
@@ -48,14 +48,14 @@ def index(request):
 
 @require_POST
 def generate(request, domain):
-    """Generate PGP key for SSH service."""
+    """Generate OpenPGP key for SSH service."""
     valid_domain = any((domain in domains
                         for domains in names.domains.values()))
     if valid_domain:
         try:
             actions.superuser_run(
                 'monkeysphere', ['host-import-ssh-key', 'ssh://' + domain])
-            messages.success(request, _('Generated PGP key.'))
+            messages.success(request, _('Generated OpenPGP key.'))
         except actions.ActionError as exception:
             messages.error(request, str(exception))
 
@@ -64,7 +64,7 @@ def generate(request, domain):
 
 @require_POST
 def publish(request, fingerprint):
-    """Publish PGP key for SSH service."""
+    """Publish OpenPGP key for SSH service."""
     global publish_process
     if not publish_process:
         publish_process = actions.superuser_run(