From 82dcbb7488ce1625ba4f41fbdc8e6319d3da9691 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 20 Sep 2015 11:45:53 -0400
Subject: [PATCH] Fix various issues in Mailvelope integration (#1490533)

---
 program/localization/en_US/messages.inc |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index a23bfd6..cc8d5ea 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -56,6 +56,14 @@
 $messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
 $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
+$messages['externalmessagedecryption'] = 'This is an encrypted message and can be decrypted with your browser extension.';
+$messages['nopubkeyfor'] = 'No valid public key found for $email';
+$messages['nopubkeyforsender'] = 'No valid public key found for your sender identity. Do you want to encrypt the message for the recipients only?';
+$messages['encryptnoattachments'] = 'Already uploaded attachments cannot be encrypted. Please re-add them in the encryption editor.';
+$messages['searchpubkeyservers'] = 'Do you want to search public key servers for the missing keys?';
+$messages['encryptpubkeysfound'] = 'The following public keys have been found:';
+$messages['keyservererror'] = 'Failed to get key from keyserver';
+$messages['keyimportsuccess'] = 'Public key $key successfully imported into your key ring';
 $messages['nocontactsfound'] = 'No contacts found.';
 $messages['contactnotfound'] = 'The requested contact was not found.';
 $messages['contactsearchonly'] = 'Enter some search terms to find contacts';
@@ -171,6 +179,7 @@
 $messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'Name cannot be empty.';
 $messages['nametoolong'] = 'Name is too long.';
+$messages['namedotforbidden'] = 'Folder name cannot start with a dot.';
 $messages['folderupdated'] = 'Folder updated successfully.';
 $messages['foldercreated'] = 'Folder created successfully.';
 $messages['invalidimageformat'] = 'Not a valid image format.';
@@ -189,5 +198,6 @@
 $messages['errcsrfprotectionexplain'] = "For your protection, access to this resource is secured against CSRF.\nIf you see this, you probably didn't log out before leaving the web application.\n\nHuman interaction is now required to continue.";
 $messages['errcontactserveradmin'] = 'Please contact your server-administrator.';
 $messages['clicktoresumesession'] = 'Click here to resume your previous session';
-
-?>
+$messages['errcomposesession'] = 'Compose session error';
+$messages['errcomposesessionexplain'] = 'Requested compose session not found.';
+$messages['clicktocompose'] = 'Click here to compose a new message';

--
Gitblit v1.9.1