Improve wording and style
authorThomas
Fri, 18 May 2018 12:14:05 +0200
changeset 220494aaeb734ef2
parent 2203 eb3db8f1ec68
child 2205 4299ea51fbf6
child 2206 d0173d827aa2
child 2208 7051e9283317
Improve wording and style
FPPMessage.cs
MsgProcessor.cs
     1.1 --- a/FPPMessage.cs	Fri May 18 09:36:07 2018 +0200
     1.2 +++ b/FPPMessage.cs	Fri May 18 12:14:05 2018 +0200
     1.3 @@ -29,13 +29,13 @@
     1.4                                                                            "<br><br>This message can only be opened with p≡p for Outlook or p≡p Reader for Outlook.";
     1.5          public const string PEP_FPP_MESSAGE_BODY_PLAIN_PEP_INSTALLED    = "This message is protected by p≡p. \n\nTo read this message please do the following:" +
     1.6                                                                            "\n\n1. Click the Privacy Status button on the bottom of this message to open the Handshake dialog." +
     1.7 -                                                                          "\n2. Shortly after you opened the Handshake dialog on your computer, the same dialog will show up on the screen of the sender of the message as well(depending on the setup it might take 2-3 minutes). Contact the sender through another communication channel(e.g.phone call)." +
     1.8 +                                                                          "\n2. Shortly after you opened the Handshake dialog on your computer, the same dialog will show up on the screen of the sender of the message as well (depending on the setup it might take 2-3 minutes). Contact the sender through another communication channel (e.g.phone call)." +
     1.9                                                                            "\n3. Compare the Trustwords with your communication partner. If the Trustwords match, confirm the Trustwords by clicking the green button." +
    1.10                                                                            "\n4. Shortly after, the protected message will automatically decrypt and you can read the message.";
    1.11          public const string PEP_FPP_MESSAGE_BODY_HTML_PEP_INSTALLED     = "<!DOCTYPE html><html><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'></head><body>" +
    1.12                                                                            "This message is protected by <a style=\"color:#03AA4B; text-decoration: none\" href=\"" + Globals.PEP_WEBSITE_LINK + "\">p≡p</a>. <br><br>To read this message please do the following:" +
    1.13                                                                            "<br><br>1. Click the Privacy Status button on the bottom of this message to open the Handshake dialog." +
    1.14 -                                                                          "<br>2. Shortly after you opened the Handshake dialog on your computer, the same dialog will show up on the screen of the sender of the message as well(depending on the setup it might take 2-3 minutes). Contact the sender through another communication channel(e.g.phone call)." +
    1.15 +                                                                          "<br>2. Shortly after you opened the Handshake dialog on your computer, the same dialog will show up on the screen of the sender of the message as well (depending on the setup it might take 2-3 minutes). Contact the sender through another communication channel (e.g.phone call)." +
    1.16                                                                            "<br>3. Compare the Trustwords with your communication partner. If the Trustwords match, confirm the Trustwords by clicking the green button." +
    1.17                                                                            "<br>4. Shortly after, the protected message will automatically decrypt and you can read the message.</body></html>";
    1.18          public const string PEP_FPP_ATTACHMENT_FILE_NAME                = "ignore_this_attachment.pEp";
     2.1 --- a/MsgProcessor.cs	Fri May 18 09:36:07 2018 +0200
     2.2 +++ b/MsgProcessor.cs	Fri May 18 12:14:05 2018 +0200
     2.3 @@ -110,7 +110,7 @@
     2.4                              (string.IsNullOrEmpty(message?.KeyImport) == false) &&
     2.5                              (KeySyncWizard.Wizard?.Myself?.Fingerprint?.Equals(message?.KeyImport) == false))
     2.6                          {
     2.7 -                            flags = (flags | pEpDecryptFlags.pEpDecryptFlagConsume);
     2.8 +                            flags |= pEpDecryptFlags.pEpDecryptFlagConsume;
     2.9                          }
    2.10                      }
    2.11                      else