From 58e22319f1926d5441cb7b69451bfa91d30fa03a Mon Sep 17 00:00:00 2001
From: Bruno Wagner <bwgpro@gmail.com>
Date: Wed, 8 Apr 2015 16:38:16 -0300
Subject: Closes #27 Changed the encryption status messages

---
 web-ui/app/locales/en-us/translation.json | 7 +++----
 web-ui/app/locales/en/translation.json    | 7 +++----
 web-ui/app/locales/sv/translation.json    | 2 +-
 web-ui/app/scss/_security.scss            | 6 ------
 4 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'web-ui')

diff --git a/web-ui/app/locales/en-us/translation.json b/web-ui/app/locales/en-us/translation.json
index 8cdb419e..2a474c80 100644
--- a/web-ui/app/locales/en-us/translation.json
+++ b/web-ui/app/locales/en-us/translation.json
@@ -43,10 +43,9 @@
     "no_recipient": "<No Recipients>",
     "you": "you",
     "encrypted": "Encrypted",
-    "encrypted encryption-failure": "You are not authorized to see this message.",
-    "encrypted encryption-error": "Message was encrypted but we couldn't decrypt it.",
-    "encrypted encryption-valid": "Message was transmitted securely.",
-    "not-encrypted": "Message was readable during transmission.",
+    "encrypted encryption-error": "Unable to decrypt",
+    "encrypted encryption-valid": "Encrypted",
+    "not-encrypted": "Not Encrypted",
     "signed": "Certified sender.",
     "signed signature-revoked": "Sender could not be securely identified.",
     "signed signature-expired": "Sender could not be securely identified.",
diff --git a/web-ui/app/locales/en/translation.json b/web-ui/app/locales/en/translation.json
index 8cdb419e..2a474c80 100644
--- a/web-ui/app/locales/en/translation.json
+++ b/web-ui/app/locales/en/translation.json
@@ -43,10 +43,9 @@
     "no_recipient": "<No Recipients>",
     "you": "you",
     "encrypted": "Encrypted",
-    "encrypted encryption-failure": "You are not authorized to see this message.",
-    "encrypted encryption-error": "Message was encrypted but we couldn't decrypt it.",
-    "encrypted encryption-valid": "Message was transmitted securely.",
-    "not-encrypted": "Message was readable during transmission.",
+    "encrypted encryption-error": "Unable to decrypt",
+    "encrypted encryption-valid": "Encrypted",
+    "not-encrypted": "Not Encrypted",
     "signed": "Certified sender.",
     "signed signature-revoked": "Sender could not be securely identified.",
     "signed signature-expired": "Sender could not be securely identified.",
diff --git a/web-ui/app/locales/sv/translation.json b/web-ui/app/locales/sv/translation.json
index e999ce9d..69557f6a 100644
--- a/web-ui/app/locales/sv/translation.json
+++ b/web-ui/app/locales/sv/translation.json
@@ -43,7 +43,7 @@
     "no_recipient": "<Inga mottagare>",
     "you": "du",
     "encrypted": "krypterad",
-    "encrypted encryption-failure": "Du har inte tillstånd att see det här meddelandet.",
+    "encrypted encryption-error": "Du har inte tillstånd att see det här meddelandet.",
     "encrypted encryption-valid": "Meddelandet skickades säkert.",
     "not-encrypted": "Meddelandet var läsbart medans det var på väg.",
     "signed": "Certifierad avsändare.",
diff --git a/web-ui/app/scss/_security.scss b/web-ui/app/scss/_security.scss
index 2a6b60aa..be306d86 100644
--- a/web-ui/app/scss/_security.scss
+++ b/web-ui/app/scss/_security.scss
@@ -14,12 +14,6 @@
       &:before {
         content: "\f023  \f00c";
       }
-      &.encryption-failure {
-        background: $error;
-        &:before {
-          content: "\f023  \f05e";
-        }
-      }
       &.encryption-error {
         background: $attention;
         &:before {
-- 
cgit v1.2.3