diff options
-rw-r--r-- | components/mailviewer/contents/ui/MailDataModel.qml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml index fa8c462b..ad0b1cc9 100644 --- a/components/mailviewer/contents/ui/MailDataModel.qml +++ b/components/mailviewer/contents/ui/MailDataModel.qml | |||
@@ -46,25 +46,21 @@ DelegateModel { | |||
46 | function getDetails(signed, encrypted, signatureDetails) | 46 | function getDetails(signed, encrypted, signatureDetails) |
47 | { | 47 | { |
48 | var details = ""; | 48 | var details = ""; |
49 | if (signed && encrypted) { | 49 | if (encrypted) { |
50 | details += qsTr("This message is signed and encrypted.") + "\n"; | ||
51 | } else if (encrypted) { | ||
52 | details += qsTr("This message is encrypted.") + "\n"; | 50 | details += qsTr("This message is encrypted.") + "\n"; |
53 | } else if (signed) { | ||
54 | details += qsTr("This message is signed.") + "\n"; | ||
55 | } | 51 | } |
56 | 52 | ||
57 | if (signed) { | 53 | if (signed) { |
58 | if (details.noSignaturesFound) { | 54 | if (details.noSignaturesFound) { |
59 | details += qsTr("Failed to validate the signature.") + "\n" | 55 | details += qsTr("This message has been signed but we failed to validate the signature.") + "\n" |
60 | } else if (!signatureDetails.signatureIsGood) { | 56 | } else if (!signatureDetails.signatureIsGood) { |
61 | details += qsTr("The signature is invalid.") + "\n" | 57 | details += qsTr("This message is signed but the signature is invalid.") + "\n" |
62 | } else if (signatureDetails.keyMissing) { | 58 | } else if (signatureDetails.keyMissing) { |
63 | details += qsTr("This message has been signed using key %1.").arg(signatureDetails.keyId) + "\n"; | 59 | details += qsTr("This message has been signed using the key %1.").arg(signatureDetails.keyId) + "\n"; |
64 | details += qsTr("The key details are not available.") + "\n"; | 60 | details += qsTr("The key details are not available.") + "\n"; |
65 | return details; | 61 | return details; |
66 | } else { | 62 | } else { |
67 | details += qsTr("This message has been signed using key %1 by %2.").arg(signatureDetails.keyId).arg(signatureDetails.signer) + "\n"; | 63 | details += qsTr("This message has been signed using the key %1 by %2.").arg(signatureDetails.keyId).arg(signatureDetails.signer) + "\n"; |
68 | if (signatureDetails.keyRevoked) { | 64 | if (signatureDetails.keyRevoked) { |
69 | details += qsTr("The key was revoked.") + "\n" | 65 | details += qsTr("The key was revoked.") + "\n" |
70 | } | 66 | } |