From: zoe1
Date: Tue, 13 Jul 2021 18:47:35 +0000 (+0200)
Subject: changes thunderbird and images
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fedfd57226c9fbafa14058d75637e708298549c6;p=enc-live.git
changes thunderbird and images
---
diff --git a/en/index.html b/en/index.html
index 6cba481..775834d 100644
--- a/en/index.html
+++ b/en/index.html
@@ -553,7 +553,7 @@ own version. This makes it safer from surveillance than proprietary
software (like Windows or macOS). Learn more about free software at fsf.org.
-
Most GNU/Linux operating systems come with GnuPG installed on them, so if you're running one of these systems, you don't have to download it. If you're running macOS or Windows, steps to download GnuPG are below. Before configuring your encryption setup with this guide, though, you'll need a desktop email program based on Thunderbird installed on your computer. Many GNU/Linux distributions have Thunderbird installed already. If you're using a fully free distribution of GNU/Linux, we recommend installing "Icedove" instead. Programs like these are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.
+
Most GNU/Linux operating systems come with GnuPG installed on them, so if you're running one of these systems, you don't have to download it. If you're running macOS or Windows, steps to download GnuPG are below. "Before configuring your encryption setup with this guide, though, you'll need a desktop email program installed on your computer. Many GNU/Linux distributions have one installed already, such as Icedove, which may be under the alternate name "Thunderbird." Programs like these are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.
If you already have an email program, you can skip to Step 2.
@@ -623,7 +623,7 @@ page.
Use a third-party package manager to install GnuPG
-
Your macOS comes with a program called Terminal pre-installed, which we'll use to set up your encryption with GnuPG, using the command line. However, the default macOS package manager makes it difficult to install GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape).
+
Your macOS comes with a program called "Terminal" pre-installed, which we'll use to set up your encryption with GnuPG, using the command line. However, the default macOS package manager makes it difficult to install GnuPG and other pieces of free software (like Emacs, GIMP, or Inkscape).
To make things easier, we recommend setting up the third-party package manager "Homebrew" to install GnuPG. Copy the link on the home page of Homebrew and paste it in Terminal. Click "Enter" and wait for it to finalize.
When it is done, install the program by entering the following code in Terminal:
brew install gnupg gnupg2. After installation is done, you can follow the steps of the rest of this guide.
@@ -915,7 +915,7 @@ Because this is your key, you should choose
#3 Set up email encryption
-
Icedove and Thunderbird email programs have PGP functionality integrated, which makes it pretty easy to work with. We'll take you through the steps of integrating and using your key in these email clients.
+
The Icedove (or Thunderbird) email program has PGP functionality integrated, which makes it pretty easy to work with. We'll take you through the steps of integrating and using your key in these email clients.
@@ -924,7 +924,7 @@ Because this is your key, you should choose
+alt="Step 3.A: Email Menu" />
@@ -1131,7 +1131,7 @@ independent of the actual email.
For greater security against potential attacks, you can turn off
HTML. Instead, you can render the message body as plain text. In order
-to do this in email clients based on Thunderbird, go to View > Message Body As > Plain
+to do this in Icedove or Thunderbird, go to View > Message Body As > Plain
Text.
diff --git a/static/edward_messages-en.txt b/static/edward_messages-en.txt
new file mode 100644
index 0000000..03fe097
--- /dev/null
+++ b/static/edward_messages-en.txt
@@ -0,0 +1,41 @@
+### 1 | Greeting NOTE: The Greeting body text is sent out with all emails, but the subject will change depending on the message.
+Subject: I received your public key
+Body: Hello, I am Edward, the friendly GnuPG bot.
+
+### 2 | Success Decrypt
+Subject: I decrypted your message
+Body: I received your message and decrypted it.
+
+### 3 | Quote Follows NOTE: This is sent out if Decryption and Sig verification were successful.
+Here's a copy of your message:
+
+### 4 | Pubkey Received
+I received your public key. Thanks.
+
+### 5 | Failed Decrypt
+I'm sorry, I was not able to decrypt your message. Are you sure you encrypted it with my public key?
+
+### 6 | No Pubkey
+I'm sorry, I was not able to find your public key. Did you remember to attach it?
+
+### 7 | Sig Failure: NOTE: Sig Sucess and Sig Failure are sent out in addition to success/failure of decryption.
+I wasn't able to verify your cryptographic signature.
+
+### 8 | Sig Success:
+I succesfully verified your cryptographic signature.
+
+### 9 | Signature:
+- Edward, the friendly GnuPG bot
+
+The Free Software Foundation created me. Can you donate to support their work? | https://www.fsf.org/donate
+
+### 10 | Space: NOTE: This marks whether spaces are put between symbols and periods, etc. Please use quotes. Thanks!
+" "
+
+---
+
+Copyright 2014-2021 Free Software Foundation, Inc.
+
+Licensed under the Creative Commons Attribution license (CC-BY). See full
+source and attribution text at http://creativecommons.org/licenses/by/4.0/legalcode.
+
diff --git a/static/img/en/screenshots/section7-next-steps.png b/static/img/en/screenshots/section7-next-steps.png
new file mode 100644
index 0000000..e7b2c4b
Binary files /dev/null and b/static/img/en/screenshots/section7-next-steps.png differ
diff --git a/static/img/en/screenshots/step5a-key-properties.png b/static/img/en/screenshots/step5a-key-properties.png
index 3c2b67b..1ff6639 100644
Binary files a/static/img/en/screenshots/step5a-key-properties.png and b/static/img/en/screenshots/step5a-key-properties.png differ
diff --git a/static/svg/en/donate.svg b/static/svg/en/donate.svg
new file mode 100644
index 0000000..2e8fd2b
--- /dev/null
+++ b/static/svg/en/donate.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/static/svg/en/gnupg-infographic.svg b/static/svg/en/gnupg-infographic.svg
new file mode 100644
index 0000000..fe5aa75
--- /dev/null
+++ b/static/svg/en/gnupg-infographic.svg
@@ -0,0 +1,7965 @@
+
+
+
+
diff --git a/static/svg/en/infographic.svg b/static/svg/en/infographic.svg
new file mode 100644
index 0000000..e0a25f4
--- /dev/null
+++ b/static/svg/en/infographic.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/static/svg/en/join.svg b/static/svg/en/join.svg
new file mode 100644
index 0000000..905ca41
--- /dev/null
+++ b/static/svg/en/join.svg
@@ -0,0 +1,152 @@
+
+
+
+
diff --git a/static/svg/en/license.txt b/static/svg/en/license.txt
new file mode 100644
index 0000000..f45457a
--- /dev/null
+++ b/static/svg/en/license.txt
@@ -0,0 +1,4 @@
+Copyright 2014-2021 Free Software Foundation, Inc.
+
+Licensed under the Creative Commons Attribution license (CC-BY). See full
+source and attribution text at http://creativecommons.org/licenses/by/4.0/legalcode.
diff --git a/static/svg/en/workshop-section1.svg b/static/svg/en/workshop-section1.svg
new file mode 100644
index 0000000..15d50a6
--- /dev/null
+++ b/static/svg/en/workshop-section1.svg
@@ -0,0 +1,1313 @@
+
+
+
+