From 4c7ce7bfc917ca76dede8ae29ad4ab96a67968fd Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 02 Apr 2016 03:40:17 -0400
Subject: [PATCH] Merge branch 'guitarmanusa-attach-pgp-key'

---
 plugins/enigma/localization/en_US.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/plugins/enigma/localization/en_US.inc b/plugins/enigma/localization/en_US.inc
index 0e4d2b4..5224ca5 100644
--- a/plugins/enigma/localization/en_US.inc
+++ b/plugins/enigma/localization/en_US.inc
@@ -53,6 +53,7 @@
 $labels['supportdecryption'] = 'Enable message decryption';
 $labels['signdefault'] = 'Sign all messages by default';
 $labels['encryptdefault'] = 'Encrypt all messages by default';
+$labels['attachpubkeydefault'] = 'Attach my public PGP key by default';
 $labels['passwordtime'] = 'Keep private key passwords for';
 $labels['nminutes'] = '$m minute(s)';
 $labels['wholesession'] = 'the whole session';
@@ -82,6 +83,7 @@
 $labels['enterkeypasstitle'] = 'Enter key passphrase';
 $labels['enterkeypass'] = 'A passphrase is needed to unlock the secret key ($keyid) for user: $user.';
 $labels['arialabelkeyexportoptions'] = 'Keys export options';
+$labels['attachpubkeymsg'] = 'Attach my public key';
 
 $messages = array();
 $messages['sigvalid'] = 'Verified signature from $sender.';

--
Gitblit v1.9.1