From bdf93a15db7da0e45c43cf6ee3c71acd561cec62 Mon Sep 17 00:00:00 2001
From: picklesrus <picklesrus@users.noreply.github.com>
Date: Thu, 13 Dec 2018 11:16:59 -0500
Subject: [PATCH] Add questions to FAQ and change some messages.

---
 src/views/download/download.jsx | 22 ++++++++++++++++++++--
 src/views/download/l10n.json    | 19 +++++++++++++------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/views/download/download.jsx b/src/views/download/download.jsx
index 39cbeec53..1368d2e15 100644
--- a/src/views/download/download.jsx
+++ b/src/views/download/download.jsx
@@ -107,14 +107,14 @@ class Download extends React.Component {
                                     number={1}
                                 >
                                     <span className="step-description">
-                                        <FormattedMessage id="download.downloadAndInstall" />
+                                        <FormattedMessage id="download.downloadScratchDesktop" />
                                     </span>
                                     <div className="downloads-container">
                                         <a
                                             className="download-button"
                                             href="https://beta.scratch.mit.edu/"
                                         >
-                                            <span>Download Scratch Desktop</span>
+                                            <FormattedMessage id="download.downloadButton" />
                                         </a>
                                     </div>
                                 </Step>
@@ -150,6 +150,24 @@ class Download extends React.Component {
                             <FormattedMessage id="download.troubleshootingTitle" />
                         </h2>
 
+                        <h3 className="faq-question">
+                            <FormattedMessage id="download.canIUseScratchLink" />
+                        </h3>
+                        <p>
+                            <FormattedMessage id="download.canIUseScratchLinkAnswer" />
+                        </p>
+                        <h3 className="faq-question">
+                            <FormattedMessage id="download.desktopAndBrowser" />
+                        </h3>
+                        <p>
+                            <FormattedMessage id="download.yesAnswer" />
+                        </p>
+                        <h3 className="faq-question">
+                            <FormattedMessage id="download.canIShare" />
+                        </h3>
+                        <p>
+                            <FormattedMessage id="download.canIShareAnswer" />
+                        </p>
                         <h3 className="faq-question">
                             <FormattedMessage id="download.whenSupportLinux" />
                         </h3>
diff --git a/src/views/download/l10n.json b/src/views/download/l10n.json
index a1db7fb93..8ea41357a 100644
--- a/src/views/download/l10n.json
+++ b/src/views/download/l10n.json
@@ -1,11 +1,12 @@
 {
-  "download.title": "Scratch 3.0 Desktop",
-  "download.intro": "You can install the Scratch 3.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
+  "download.title": "Scratch Desktop",
+  "download.intro": "You can install the Scratch Desktop editor to work on projects without an internet connection. This version will work on Windows and MacOS.",
   "download.requirements": "Requirements",
   "download.imgAltDownloadIllustration" : "Scratch 3.0 Desktop screenshot",
   "download.installHeaderTitle": "Install Scratch Desktop",
-  "download.downloadAndInstall": "Download and install Scratch Desktop",
-  "download.troubleshootingTitle": "FAQ",
+  "download.downloadScratchDesktop": "Download Scratch Desktop",
+  "download.downloadButton": "Download",
+  "download.troubleshootingTitle": "FAQ / Troubleshooting",
   "download.startScratchDesktop": "Start Scratch Desktop",
   "download.howDoIInstall": "How do I install Scratch Desktop?",
   "download.whenSupportLinux": "When will you have Scratch Desktop for Linux?",
@@ -20,6 +21,12 @@
   "download.cannotAccessWindowsStore" : "What if I can't access the Microsoft Store?",
   "download.appstoreAccessAnswer" : "You can download Scratch Desktop directly to your computer by {directDownloadLink}.",
   "download.directDownloadText" : "clicking here",
-  "download.macMoveToApplications" : "Move Scratch Desktop to your Applications folder and start Scratch Desktop.",
-  "download.winMoveToApplications" : "Run it."
+  "download.macMoveToApplications" :  "Click to run the installer. Move Scratch Desktop to your Applications folder.",
+  "download.winMoveToApplications" : " Click on Scratch Desktop.exe to run the installer.",
+  "download.canIUseScratchLink" : "Can I use Scratch Link to connect to extensions?",
+  "download.canIUseScratchLinkAnswer" : "Yes. You'll need an Internet connection to use Scratch Link.",
+  "download.desktopAndBrowser": "Can I use Scratch Desktop and also have Scratch open in the browser?",
+  "download.yesAnswer" : "Yes.",
+  "download.canIShare": "Can I share from Scratch Desktop?",
+  "download.canIShareAnswer": "This isn’t supported currently. For now, you can save a project from Scratch Desktop, upload it to your Scratch account, and share it there. In a later version we will add the ability to upload to your Scratch account directly in Scratch Desktop."
 }