From: Andrew Engelbrecht Date: Wed, 14 Jul 2021 21:01:11 +0000 (-0400) Subject: replaced assets with those from the live repo X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=905aeec922976e0f12b7195ca6dbd2e62f605946;p=enc.git replaced assets with those from the live repo --- diff --git a/static/css/main.css b/static/css/main.css index a359c7c0..f090a93e 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -269,7 +269,7 @@ a:focus > img + strong { #header ul.os { line-height: 1; - margin: .5em 0 2em; + margin: .5em 0 .5em; padding: 0 0 .25em; border-bottom: 1px solid #94b3e2; font-size: 1.25em; @@ -350,7 +350,7 @@ a:focus > img + strong { .main p:first-child { margin: 0 0 0.5em ; } .main p.notes { - color: #808080; + color: #5c5c5c; } .main h3 { diff --git a/static/edward_messages-en.txt b/static/edward_messages-en.txt new file mode 100644 index 00000000..03fe0973 --- /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/gnupg-infographic.zip b/static/gnupg-infographic.zip index 8b7a66a3..f0e81aa8 100644 Binary files a/static/gnupg-infographic.zip and b/static/gnupg-infographic.zip differ diff --git a/static/img/en/full-infographic.png b/static/img/en/full-infographic.png index 64118142..a4e6b4fb 100644 Binary files a/static/img/en/full-infographic.png and b/static/img/en/full-infographic.png differ diff --git a/static/img/en/screenshots/section4-web-of-trust.png b/static/img/en/screenshots/section5-web-of-trust.png similarity index 100% rename from static/img/en/screenshots/section4-web-of-trust.png rename to static/img/en/screenshots/section5-web-of-trust.png diff --git a/static/img/en/screenshots/section5-01-use-it-well.png b/static/img/en/screenshots/section6-01-use-it-well.png similarity index 100% rename from static/img/en/screenshots/section5-01-use-it-well.png rename to static/img/en/screenshots/section6-01-use-it-well.png diff --git a/static/img/en/screenshots/section5-02-use-it-well.png b/static/img/en/screenshots/section6-02-use-it-well.png similarity index 100% rename from static/img/en/screenshots/section5-02-use-it-well.png rename to static/img/en/screenshots/section6-02-use-it-well.png diff --git a/static/img/en/screenshots/section6-next-steps.png b/static/img/en/screenshots/section7-next-steps.png similarity index 100% rename from static/img/en/screenshots/section6-next-steps.png rename to static/img/en/screenshots/section7-next-steps.png diff --git a/static/img/en/screenshots/step1a-install-wizard.png b/static/img/en/screenshots/step1a-install-wizard.png index dbe82389..fdfd9581 100644 Binary files a/static/img/en/screenshots/step1a-install-wizard.png and b/static/img/en/screenshots/step1a-install-wizard.png differ diff --git a/static/img/en/screenshots/step1b-01-tools-addons.png b/static/img/en/screenshots/step1b-01-tools-addons.png deleted file mode 100644 index 8a539ed7..00000000 Binary files a/static/img/en/screenshots/step1b-01-tools-addons.png and /dev/null differ diff --git a/static/img/en/screenshots/step1b-02-search.png b/static/img/en/screenshots/step1b-02-search.png deleted file mode 100644 index e06c46c5..00000000 Binary files a/static/img/en/screenshots/step1b-02-search.png and /dev/null differ diff --git a/static/img/en/screenshots/step1b-03-install.png b/static/img/en/screenshots/step1b-03-install.png deleted file mode 100644 index 20caa9f6..00000000 Binary files a/static/img/en/screenshots/step1b-03-install.png and /dev/null differ diff --git a/static/img/en/screenshots/step2a-02-make-keypair.png b/static/img/en/screenshots/step2a-02-make-keypair.png new file mode 100644 index 00000000..3767a0a7 Binary files /dev/null and b/static/img/en/screenshots/step2a-02-make-keypair.png differ diff --git a/static/img/en/screenshots/step2a-03-make-keypair.png b/static/img/en/screenshots/step2a-03-make-keypair.png new file mode 100644 index 00000000..b0672d3d Binary files /dev/null and b/static/img/en/screenshots/step2a-03-make-keypair.png differ diff --git a/static/img/en/screenshots/step2b-04-upload-and-certificate.png b/static/img/en/screenshots/step2b-04-upload-and-certificate.png new file mode 100644 index 00000000..3649c827 Binary files /dev/null and b/static/img/en/screenshots/step2b-04-upload-and-certificate.png differ diff --git a/static/img/en/screenshots/step3a-import-from-file.png b/static/img/en/screenshots/step3a-import-from-file.png new file mode 100644 index 00000000..2b4653bc Binary files /dev/null and b/static/img/en/screenshots/step3a-import-from-file.png differ diff --git a/static/img/en/screenshots/step3a-open-key-manager.png b/static/img/en/screenshots/step3a-open-key-manager.png new file mode 100644 index 00000000..604152a4 Binary files /dev/null and b/static/img/en/screenshots/step3a-open-key-manager.png differ diff --git a/static/img/en/screenshots/step3a-success.png b/static/img/en/screenshots/step3a-success.png new file mode 100644 index 00000000..e0823fb4 Binary files /dev/null and b/static/img/en/screenshots/step3a-success.png differ diff --git a/static/img/en/screenshots/step3a-troubleshoot.png b/static/img/en/screenshots/step3a-troubleshoot.png new file mode 100644 index 00000000..05275b47 Binary files /dev/null and b/static/img/en/screenshots/step3a-troubleshoot.png differ diff --git a/static/img/en/screenshots/step4a-send-key-to-Edward.png b/static/img/en/screenshots/step4a-send-key-to-Edward.png new file mode 100644 index 00000000..22b90ae7 Binary files /dev/null and b/static/img/en/screenshots/step4a-send-key-to-Edward.png differ diff --git a/static/img/en/screenshots/step4b-option1-verify-key.png b/static/img/en/screenshots/step4b-option1-verify-key.png new file mode 100644 index 00000000..29fb5d19 Binary files /dev/null and b/static/img/en/screenshots/step4b-option1-verify-key.png differ diff --git a/static/img/en/screenshots/step4b-option2-import-key.png b/static/img/en/screenshots/step4b-option2-import-key.png new file mode 100644 index 00000000..728474e9 Binary files /dev/null and b/static/img/en/screenshots/step4b-option2-import-key.png differ diff --git a/static/img/en/screenshots/step4c-Edward-response.png b/static/img/en/screenshots/step4c-Edward-response.png new file mode 100644 index 00000000..f6447720 Binary files /dev/null and b/static/img/en/screenshots/step4c-Edward-response.png differ diff --git a/static/img/en/screenshots/step5a-key-properties.png b/static/img/en/screenshots/step5a-key-properties.png new file mode 100644 index 00000000..1ff66393 Binary files /dev/null and b/static/img/en/screenshots/step5a-key-properties.png differ diff --git a/static/img/en/screenshots/workshop-section1-update.png b/static/img/en/screenshots/workshop-section1-update.png new file mode 100644 index 00000000..e9b1860b Binary files /dev/null and b/static/img/en/screenshots/workshop-section1-update.png differ diff --git a/static/img/en/screenshots/workshop-section1.png b/static/img/en/screenshots/workshop-section1.png deleted file mode 100644 index 575bc9ac..00000000 Binary files a/static/img/en/screenshots/workshop-section1.png and /dev/null differ diff --git a/static/svg/en/donate.svg b/static/svg/en/donate.svg new file mode 100644 index 00000000..2e8fd2b0 --- /dev/null +++ b/static/svg/en/donate.svg @@ -0,0 +1,75 @@ + + + + + + + + image/svg+xml + + + + + + + + + DONATE + diff --git a/static/svg/en/gnupg-infographic.svg b/static/svg/en/gnupg-infographic.svg new file mode 100644 index 00000000..fe5aa75a --- /dev/null +++ b/static/svg/en/gnupg-infographic.svg @@ -0,0 +1,7965 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + To protect ourselves from surveillance, we need to learn when to use GnuPG and startsharing our public keys whenever we share email addresses. + + + Thousands of people already use GnuPG, including activists, journalists, whistleblowers and everyday folks. Each person using it makes our community stronger, and shows surveillance agencies that we are ready to fight back. + + + + + + + + + + + GnuPG is freely licensed software; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows or Word). Learn more at FSF.org. + + + Teach yourself email self-defense. Learn GnuPG in 30 minutes at EmailSelfDefense.FSF.org + + + + + + + + + + + + + + + + + + + + + + PUBLIC PRIVATE YOUR PUBLIC KEY YOUR PRIVATE KEY + + + All you need is a simple program called GnuPG. It encrypts your email into a code that only the right people can read. GnuPG runs on pretty much any computer or smartphone. It's freely licensed and costs no money. Each user has a unique public key and private key, which are random strings of numbers. Take back your privacy! Meet GnuPG Your public key isn't like a physical key, because it's shared. It's in an online directory, where people can look it up and download it. People use your public key, along with GnuPG, to encrypt emails they send to you. Your private key is more like a physical key, because you keep it to yourself (on your computer).  You use GnuPG and your private key to decode encrypted emails other people send to you. If an email encrypted with GnuPG falls into the wrong hands, it'll just look like nonsense. Without the real recipient's private key, it's almost impossible to read it. To the real recipient, it opens up like a normal email. Easy! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The password protecting your email is only a thin layer of security that can't protect against the battering ram of sophisticated surveillance systems. Each message passes through many computer systems on the way to its destination. Surveillance agencies take advantage of this to read millions and millions of emails. Even if you have nothing to hide, when you send normal email, the people you talk to are being exposed as well. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? ? ? ? + + + + + + + + + + + + + + + + + + + + ERROR + + + %#&$! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EMAIL SELF-DEFENSE Bulk surveillance violates our fundamental rights and makes free speech risky. But we're far from helpless to do something about it. + + + + + + + + + PUB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PRIV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? ? ? ? + The sender and recipient are both safer now. Even if this email doesn't have any private information, being encrypted makes it gum up bulk surveillance systems. Take that, surveillance! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GnuPG + + + + Infographic and guide design by Journalism++ + + + + + Copyright 2021 Free Software Foundation. Remixing encouraged! Get the source at the URL above. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/svg/en/infographic.svg b/static/svg/en/infographic.svg new file mode 100644 index 00000000..e0a25f49 --- /dev/null +++ b/static/svg/en/infographic.svg @@ -0,0 +1,89 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + VIEW AND SHARE OURINFOGRAPHIC + diff --git a/static/svg/en/join.svg b/static/svg/en/join.svg new file mode 100644 index 00000000..905ca414 --- /dev/null +++ b/static/svg/en/join.svg @@ -0,0 +1,152 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + NOW + diff --git a/static/svg/en/license.txt b/static/svg/en/license.txt new file mode 100644 index 00000000..f45457aa --- /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/step1a-install-wizard.svg b/static/svg/en/step1a-install-wizard.svg deleted file mode 100644 index 8388ac5e..00000000 --- a/static/svg/en/step1a-install-wizard.svg +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - Email Wizard Setup - - - - - - - - - - - - - This wizard will guide you through the installation of your new email program.Click next to continue. Welcome to Email Setup Wizard - - - - - - - Next > - Cancel - - - - diff --git a/static/svg/en/step1b-02-search.svg b/static/svg/en/step1b-02-search.svg deleted file mode 100644 index 189fe18e..00000000 --- a/static/svg/en/step1b-02-search.svg +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - File Edit View Message Go - Tools Help - - - - - - - Extensions Get Add-ons Appearance Plugins Dictionaries Inbox - - - - - - - - Search Add-ons - - - - - Add-ons Manager - - - - - - - - - diff --git a/static/svg/en/step1b-03-install.svg b/static/svg/en/step1b-03-install.svg deleted file mode 100644 index a5e1d51b..00000000 --- a/static/svg/en/step1b-03-install.svg +++ /dev/null @@ -1,691 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - File Edit View Message Go - Tools Help - - - - - - - Extensions Get Add-ons Appearance Plugins Dictionaries Inbox - - - - - - - Enigmail - - - Add-ons Manager - - - - - - PGP - Enigmail Open PGP message encryption and authentication - Search - - - - Install - - - - - - - - - - - My Add-ons Search: Available Add-ons - - - - - - - - - - - - diff --git a/static/svg/en/workshop-section1.svg b/static/svg/en/workshop-section1.svg new file mode 100644 index 00000000..15d50a61 --- /dev/null +++ b/static/svg/en/workshop-section1.svg @@ -0,0 +1,1313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + FREE SOFTWAREFREE SOCIETY + + + + + + + + + + GNUPG + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 60% + OK + + + + + + + + + + + + + + + + + + + + + + +