From 8079762c812d4e58cd42c174db5aec6544c76181 Mon Sep 17 00:00:00 2001
From: Patrick G <geek1011@outlook.com>
Date: Tue, 20 Jun 2017 19:56:08 -0400
Subject: [PATCH 1/3] Fix wording

---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c1aa44e8d7a4..59aa5b9a5ee7 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -383,7 +383,7 @@ ssh_key_deletion_success = The SSH key has been deleted.
 gpg_key_deletion_success = The GPG key has been deleted.
 add_on = Added on
 valid_until = Valid until
-never = never
+never = forever
 last_used = Last used on
 no_activity = No recent activity
 key_state_desc = This key has been used in the last 7 days

From 1ae0f3210e0bba7ef840fb15434abfb6b5647840 Mon Sep 17 00:00:00 2001
From: Patrick G <geek1011@outlook.com>
Date: Fri, 23 Jun 2017 17:42:54 -0400
Subject: [PATCH 2/3] Update locale_en-US.ini

---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 59aa5b9a5ee7..a3b8bce9e84b 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -383,7 +383,7 @@ ssh_key_deletion_success = The SSH key has been deleted.
 gpg_key_deletion_success = The GPG key has been deleted.
 add_on = Added on
 valid_until = Valid until
-never = forever
+valid_forever = Valid forever
 last_used = Last used on
 no_activity = No recent activity
 key_state_desc = This key has been used in the last 7 days

From 9c82615a6bdf30f22f41169700a542d83b2317fb Mon Sep 17 00:00:00 2001
From: Patrick G <geek1011@outlook.com>
Date: Fri, 23 Jun 2017 17:46:47 -0400
Subject: [PATCH 3/3] Update keys_gpg.tmpl

---
 templates/user/settings/keys_gpg.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index a20bc8e140ee..6d30bc733197 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -26,7 +26,7 @@
             <div class="activity meta">
                 <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i>
                  -
-                <i>{{$.i18n.Tr "settings.valid_until"}} <span>{{if not .Expired.IsZero }}{{DateFmtShort .Expired}}{{else}}{{$.i18n.Tr "settings.never"}}{{end}}</span></i>
+				<i>{{if not .Expired.IsZero }}{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i>
             </div>
           </div>
       </div>