From 66c44664654c1209526d9b30c77d41abb42785de Mon Sep 17 00:00:00 2001
From: Champika <champika@media.mit.edu>
Date: Wed, 19 Dec 2018 18:05:24 -0500
Subject: [PATCH 1/4] faq page updates for Scratch 3

---
 src/views/faq/faq.jsx   | 132 ++++++++++++++++++-------
 src/views/faq/l10n.json | 212 ++++++++++++++++++++++++----------------
 2 files changed, 222 insertions(+), 122 deletions(-)

diff --git a/src/views/faq/faq.jsx b/src/views/faq/faq.jsx
index d24160e7a..a5c1c0246 100644
--- a/src/views/faq/faq.jsx
+++ b/src/views/faq/faq.jsx
@@ -21,19 +21,38 @@ const Faq = injectIntl(props => (
 
                     <dt><FormattedMessage id="faq.makeGameTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.makeGameBody" /></dd>
+	
+                    <dt><FormattedMessage id="faq.whoUsesScratchTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.whoUsesScratchBody" /></dd>
 
                     <dt><FormattedMessage id="faq.requirementsTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.requirementsBody" /></dd>
-
+					<b><FormattedHTMLMessage id="faq.requirementsDesktop" /></b>
+					<ul>
+						<li><FormattedHTMLMessage id="faq.requirementsDesktopChrome" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsDesktopEdge" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsDesktopFirefox" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsDesktopSafari" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsDesktopIE" /></li>
+                     
+                    </ul>
+					<b><FormattedHTMLMessage id="faq.requirementsTablet" /></b>
+					<ul>
+						<li><FormattedHTMLMessage id="faq.requirementsTabletChrome" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsTabletSafari" /></li>
+                    </ul>
+					<FormattedMessage id="faq.requirementsNote" />
+					<ul>
+						<li><FormattedHTMLMessage id="faq.requirementsNoteDesktop" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsNoteWebGL" /></li>
+						<li><FormattedHTMLMessage id="faq.requirementsNoteTablets" /></li>
+                    </ul>
                     <dt><FormattedMessage id="faq.offlineTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.offlineBody" /></dd>
 
                     <dt><FormattedMessage id="faq.uploadOldTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.uploadOldBody" /></dd>
 
-                    <dt><FormattedMessage id="faq.recordVideoTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.recordVideoBody" /></dd>
-
                     <dt><FormattedMessage id="faq.scratchCostTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.scratchCostBody" /></dd>
 
@@ -41,26 +60,51 @@ const Faq = injectIntl(props => (
                     <dd><FormattedHTMLMessage id="faq.mediaLabBody" /></dd>
                 </dl>
             </section>
-            <section id="privacy">
+            <section id="scratch3">
                 <span className="nav-spacer" />
-                <h2><FormattedMessage id="faq.privacyTitle" /></h2>
+                <h2><FormattedMessage id="faq.scratch3Title" /></h2>
                 <dl>
-                    <dt><FormattedMessage id="faq.accountInfoTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.accountInfoList" /></dd>
-                    <ul>
-                        <li><FormattedHTMLMessage id="faq.privacyUsername" /></li>
-                        <li><FormattedHTMLMessage id="faq.privacyCountry" /></li>
-                        <li><FormattedHTMLMessage id="faq.privacyBirthdate" /></li>
-                        <li><FormattedHTMLMessage id="faq.privacyGender" /></li>
-                        <li><FormattedHTMLMessage id="faq.privacyEmail" /></li>
+                    <dt><FormattedMessage id="faq.aboutScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.aboutScratch3Body" /></dd>
+                    <dt><FormattedMessage id="faq.reportBugsScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.reportBugsScratch3Body" /></dd>
+                    <dt><FormattedMessage id="faq.languagesScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.languagesScratch3Body" /></dd>
+                    <dt><FormattedMessage id="faq.removedBlocksScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.removedBlocksScratch3Body" /></dd>
+                    <dt><FormattedMessage id="faq.newBlocksScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.newBlocksScratch3Body" /></dd>
+					<ul>
+                        <li><FormattedHTMLMessage id="faq.newBlocksSoundEffect" /></li>
+						<li><FormattedHTMLMessage id="faq.newBlocksOperators" /></li>
+						<li><FormattedHTMLMessage id="faq.newBlocksPen" /></li>
+						<li><FormattedHTMLMessage id="faq.newBlocksGlide" /></li>
+						<li><FormattedHTMLMessage id="faq.newBlocksExtensions" /></li>
+                     
                     </ul>
-                    <dd><FormattedHTMLMessage id="faq.accountPublicInfo" /></dd>
-                    <dt><FormattedMessage id="faq.dataCollectionTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.dataCollectionOne" /></dd>
-                    <dt><FormattedMessage id="faq.rentInfoTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.rentInfoBody" /></dd>
-                    <dt><FormattedMessage id="faq.viewUnsharedTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.viewUnsharedBody" /></dd>
+					<dt><FormattedMessage id="faq.biggerBlocksScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.biggerBlocksScratch3Body" /></dd>
+                    <dt><FormattedMessage id="faq.paintEditorScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.paintEditorScratch3Body" /></dd>
+					<ul>
+                        <li><FormattedHTMLMessage id="faq.paintEditorLayout" /></li>
+						<li><FormattedHTMLMessage id="faq.paintEditorTools" /></li>
+						<li><FormattedHTMLMessage id="faq.paintEditorColors" /></li>
+						<li><FormattedHTMLMessage id="faq.paintEditorVector" /></li>
+						<li><FormattedHTMLMessage id="faq.paintEditorLayers" /></li>
+						<li><FormattedHTMLMessage id="faq.paintEditorGradients" /></li>
+                     
+                    </ul>
+                    <dt><FormattedMessage id="faq.soundEditorScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.soundEditorScratch3Body" /></dd>
+					<ul>
+                        <li><FormattedHTMLMessage id="faq.soundEditorRecording" /></li>
+						<li><FormattedHTMLMessage id="faq.soundEditorTrimming" /></li>
+						<li><FormattedHTMLMessage id="faq.soundEditorEffects" /></li>              
+                    </ul>
+                    <dt><FormattedMessage id="faq.tipsWindwScratch3Title" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.tipsWindowScratch3Body" /></dd>
+                   
                 </dl>
             </section>
             <section id="remix">
@@ -81,12 +125,18 @@ const Faq = injectIntl(props => (
                 <span className="nav-spacer" />
                 <h2><FormattedMessage id="faq.accountsTitle" /></h2>
                 <dl>
-                    <dt><FormattedMessage id="faq.confirmedAccountTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.confirmedAccountBody" /></dd>
-                    <dt><FormattedMessage id="faq.checkConfirmedTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.checkConfirmedBody" /></dd>
+                    <dt><FormattedMessage id="faq.whyAccountTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.whyAccountBody" /></dd>
+	
+                    <dt><FormattedMessage id="faq.createAccountTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.createAccountBody" /></dd>
+	
                     <dt><FormattedMessage id="faq.howToConfirmTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.howToConfirmBody" /></dd>
+	
+                    <dt><FormattedMessage id="faq.checkConfirmedTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.checkConfirmedBody" /></dd>
+                   
                     <dt><FormattedMessage id="faq.requireConfirmTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.requireConfirmBody" /></dd>
                     <dt><FormattedMessage id="faq.forgotPasswordTitle" /></dt>
@@ -147,6 +197,20 @@ const Faq = injectIntl(props => (
                     <dd><FormattedHTMLMessage id="faq.stolenAccountBody" /></dd>
                 </dl>
             </section>
+            <section id="scratch-extensions">
+                <span className="nav-spacer" />
+                <h2><FormattedMessage id="faq.scratchExtensionsTitle" /></h2>
+                <dl>
+                    <dt><FormattedMessage id="faq.aboutExtensionsTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.aboutExtensionsBody" /></dd>
+                    <dt><FormattedMessage id="faq.howToAddExtensionsTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.howToAddExtensionsBody" /></dd>
+                    <dt><FormattedMessage id="faq.createExtensionsTitle" /></dt>
+                    <dd><FormattedHTMLMessage id="faq.createExtensionsBody" /></dd>
+                    <dt><FormattedMessage id="faq.scratchXTitle" /></dt>
+                    <dd><FormattedMessage id="faq.scratchXBody" /></dd>  
+                </dl>
+            </section>
             <section id="clouddata">
                 <span className="nav-spacer" />
                 <h2><FormattedMessage id="faq.cloudDataTitle" /></h2>
@@ -169,8 +233,6 @@ const Faq = injectIntl(props => (
                     <dd><FormattedHTMLMessage id="faq.newScratcherCloudBody" /></dd>
                     <dt><FormattedMessage id="faq.multiplayerTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.multiplayerBody" /></dd>
-                    <dt><FormattedMessage id="faq.cloudLagTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.cloudLagBody" /></dd>
                 </dl>
             </section>
             <section id="schools">
@@ -179,36 +241,34 @@ const Faq = injectIntl(props => (
                 <dl>
                     <dt><FormattedMessage id="faq.howTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.howBody" /></dd>
-                    <dt><FormattedMessage id="faq.ageTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.ageBody" /></dd>
                     <dt><FormattedMessage id="faq.noInternetTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.noInternetBody" /></dd>
                     <dt><FormattedMessage id="faq.communityTitle" /></dt>
-                    <dd><FormattedMessage id="faq.communityBody" /></dd>
+                    <dd><FormattedHTMLMessage id="faq.communityBody" /></dd>
                     <dt><FormattedMessage id="faq.teacherAccountTitle" /></dt>
-                    <dd><FormattedMessage id="faq.teacherAccountBody" /></dd>
+                    <dd><FormattedHTMLMessage id="faq.teacherAccountBody" /></dd>
                     <dt><FormattedMessage id="faq.requestTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.requestBody" /></dd>
-                    <dt><FormattedMessage id="faq.edTitle" /></dt>
-                    <dd><FormattedHTMLMessage id="faq.edBody" /></dd>
                     <dt><FormattedMessage id="faq.dataTitle" /></dt>
                     <dd><FormattedMessage id="faq.dataBody" /></dd>
                     <dt><FormattedMessage id="faq.lawComplianceTitle" /></dt>
-                    <dd><FormattedMessage id="faq.lawComplianceBody" /></dd>
+                    <dd><FormattedHTMLMessage id="faq.lawComplianceBody" /></dd>
                 </dl>
-                <i><FormattedHTMLMessage id="faq.schoolsMoreInfo" /></i>
             </section>
         </div>
         <nav>
             <ol>
                 <li><a href="#about-scratch"><FormattedMessage id="faq.aboutTitle" /></a></li>
-                <li><a href="#privacy"><FormattedMessage id="faq.privacyTitle" /></a></li>
+	<li><a href="#scratch3"><FormattedMessage id="faq.scratch3Title" /></a></li>
                 <li><a href="#remix"><FormattedMessage id="faq.remixTitle" /></a></li>
                 <li><a href="#accounts"><FormattedMessage id="faq.accountsTitle" /></a></li>
                 <li><a href="#permissions"><FormattedMessage id="faq.permissionsTitle" /></a></li>
                 <li><a href="#inappropriate-content">
                     <FormattedMessage id="faq.inappropriateContentTitle" />
                 </a></li>
+                <li><a href="#scratch-extensions">
+                    <FormattedMessage id="faq.scratchExtensionsTitle" />
+                </a></li>
                 <li><a href="#clouddata"><FormattedMessage id="faq.cloudDataTitle" /></a></li>
                 <li><a href="#schools"><FormattedMessage id="faq.schoolsTitle" /></a></li>
             </ol>
diff --git a/src/views/faq/l10n.json b/src/views/faq/l10n.json
index 97c77b22f..f94efb6c0 100644
--- a/src/views/faq/l10n.json
+++ b/src/views/faq/l10n.json
@@ -2,141 +2,181 @@
     "faq.title":"Frequently Asked Questions (FAQ)",
     "faq.intro":"On this page, you’ll find answers to frequently asked questions about Scratch.",
     "faq.aboutTitle":"General Questions",
-    "faq.privacyTitle":"Privacy Policy",
+    "faq.scratch3Title":"Scratch 3.0",
     "faq.remixTitle":"Remixing and Copying",
     "faq.accountsTitle":"Accounts",
     "faq.permissionsTitle":"Licensing and Permissions",
     "faq.inappropriateContentTitle":"Inappropriate Content",
-    "faq.cloudDataTitle":"Cloud Data",
+	"faq.scratchExtensionsTitle":"Scratch Extensions",
+    "faq.cloudDataTitle":"Cloud Variables",
     "faq.aboutScratchTitle":"What is Scratch, and what can I do with it?",
-    "faq.aboutScratchBody":"Scratch is a programming language and online community where you can create your own interactive stories, games, and animations -- and share your creations with others around the world. In the process of designing and programming Scratch projects, young people learn to think creatively, reason systematically, and work collaboratively. To learn more about Scratch, check out the <a href=\"/about\">About Scratch</a> page.",
+    "faq.aboutScratchBody":"With the Scratch programming language and online community, you can create your own interactive stories, games, and animations -- and share your creations with others around the world. As young people create and share Scratch projects, they learn to think creatively, reason systematically, and work collaboratively. To learn more about Scratch, see the <a href=\"/about\">About Scratch</a> page.",
     "faq.makeGameTitle":"How do I make a game or animation with Scratch?",
-    "faq.makeGameBody":"Check out the <a href=\"/tips\">tips page</a> to see lots of ways to get started with Scratch. Or just <a href=\"/projects/editor/?tutorial=getStarted\">dive in</a> to the project editor.",
+    "faq.makeGameBody":"Check out the <a href=\"/ideas\">Ideas page</a> to see lots of ways to get started with Scratch",
+    "faq.whoUsesScratchTitle":"Who uses Scratch?",
+    "faq.whoUsesScratchBody":"Scratch is used by people from all backgrounds, in all countries around the world, in all types of settings -- homes, schools, libraries, museums, and more. Scratch is designed especially for young people ages 8 to 16, but people of all ages create and share with Scratch. Younger children may want to try <a href=\"https://www.scratchjr.org/\">ScratchJr</a>, a simplified version of Scratch designed for ages 5 to 7.",
     "faq.requirementsTitle":"What are the system requirements for Scratch?",
-    "faq.requirementsBody":"To run Scratch 2.0, you need to be using (1) a Windows, ChromeOS, Mac, or Linux computer; (2) a version of <a href=\"https://get.adobe.com/flashplayer/\">Adobe Flash Player</a> released on or after June 15, 2016; (3) a relatively recent web browser: one of the latest two versions of <a href=\"http://google.com/chrome/\">Chrome</a> (Windows, ChromeOS, Mac or Linux), <a href=\"http://www.mozilla.org/firefox/new/\">Firefox</a> (Windows or Mac only), <a href=\"https://support.apple.com/downloads/safari\">Safari</a> (Mac only), <a href=\"https://www.microsoft.com/windows/microsoft-edge\">Edge</a> (Windows only), or <a href=\"https://www.microsoft.com/download/internet-explorer.aspx\">Internet Explorer 11</a> (Windows only). If your computer doesn’t meet these requirements, you can try downloading and installing <a href=\"/scratch_1.4\">Scratch 1.4</a>, which you can still use to share projects to the Scratch 2.0 website.",
+    "faq.requirementsBody":"Scratch will run in most current web browsers on desktops, laptops and tablets. You can view projects on mobile phones, but currently you are not able to create or edit projects on phones. Below is the list of officially supported browsers.",
+	"faq.requirementsDesktop":"Desktop",
+	"faq.requirementsDesktopChrome":"Chrome (63+)",
+	"faq.requirementsDesktopEdge":"Edge (15+)",
+	"faq.requirementsDesktopFirefox":"Firefox (57+)",
+	"faq.requirementsDesktopSafari":"Safari (11+)",
+	"faq.requirementsDesktopIE":"Internet Explorer is NOT supported.",
+	"faq.requirementsTablet":"Tablet",
+	"faq.requirementsTabletChrome":"Mobile Chrome (62+)",
+	"faq.requirementsTabletSafari":"Mobile Safari (11+)",
+	"faq.requirementsNote":"Note:",
+	"faq.requirementsNoteDesktop":"If your computer doesn’t meet these requirements, you can try the <a href=\"/download\">Scratch Desktop</a> editor (see next item in FAQ). ",
+	"faq.requirementsNoteWebGL":"If you encounter a WebGL error, try a different browser.",
+	"faq.requirementsNoteTablets":"On tablets, there is currently not a way to use \"key pressed\" blocks or right-click context menus.",
     "faq.offlineTitle":"Do you have a downloadable version so I can create and view projects offline?",
-    "faq.offlineBody":"The Scratch 2.0 offline editor allows you to create Scratch projects without an internet connection. You can <a href=\"/scratch2download/\">download Scratch 2.0</a> from the website. You can also still use <a href=\"/scratch_1.4\">Scratch 1.4</a>. Note: You can have both Scratch 1.4 and 2.0 on your computer.",
+    "faq.offlineBody":"The Scratch Desktop editor allows you to create Scratch projects without an internet connection. You can download <a href=\"/download\">Scratch Desktop</a> from the website. This was previously called the Scratch Offline editor.",
     "faq.uploadOldTitle":"Can I still upload projects created with older versions of Scratch to the website?",
-    "faq.uploadOldBody":"Yes - you can share or upload projects made with earlier versions of Scratch, and they will be visible and playable. (However, you can’t download projects made with or edited in later versions of Scratch and open them in earlier versions. For example, you can’t open a Scratch 2.0 project in <a href=\"/scratch_1.4\">Scratch 1.4</a>, because <a href=\"/scratch_1.4\">Scratch 1.4</a> doesn’t know how to read the .sb2 project file format.)",
-    "faq.recordVideoTitle":"Can I record a video of my Scratch project?",
-    "faq.recordVideoBody":"Yes, you can record a video of your Scratch project up to 60 seconds. In the Scratch editor, from the File menu, select \"Record Project Video.\" (You need to be signed in to see this option.) You can choose additional recording options (such as recording sound and mouse clicks) through the \"More Options\" menu. Then, run your project however you'd like. Once the recording is done, follow the instructions to download the file to your computer. Depending on what kind of computer you have, you may need to download another program like the <a href=\"http://www.videolan.org/vlc/index.html\">VLC Media Player</a> to play the file. This file will run on YouTube, Vimeo, and Facebook, but may need to be converted for other websites like Twitter or Tumblr.",
+    "faq.uploadOldBody":"Yes: You can share or upload projects made with earlier versions of Scratch, and they will be visible and playable. (However, you can’t download projects made with or edited in later versions of Scratch and open them in earlier versions. For example, you can’t open a Scratch 3.0 project in the desktop version of <a href=\"/download/scratch2\">Scratch 2.0</a>, because Scratch 2.0 doesn’t know how to read the .sb3 project file format.)",
     "faq.scratchCostTitle":"How much does Scratch cost? Do I need a license?",
     "faq.scratchCostBody":"Scratch is and always will be free. You don’t need a license to use Scratch in your school, home, or anywhere else. The development and maintenance of Scratch is paid for by grants and donations. If you’d like to contribute to Scratch, check out our <a href=\"https://secure.donationpay.org/scratchfoundation/\">Donate page</a>.",
     "faq.mediaLabTitle":"Who created Scratch?",
     "faq.mediaLabBody":"Scratch is developed and maintained by the Scratch Team at the <a href=\"http://llk.media.mit.edu/\">Lifelong Kindergarten group</a> at <a href=\"http://www.media.mit.edu/\">MIT Media Lab</a>.",
-    "faq.accountInfoTitle":"What information do you ask for during account registration?",
-    "faq.accountInfoList":"To protect the privacy of our community members, we limit what we collect and what we publish on the website. During the registration process, we ask for the following information:",
-    "faq.privacyUsername":"username - We ask that users avoid using their real names or other identifying information.",
-    "faq.privacyCountry":"country",
-    "faq.privacyBirthdate":"birth month and year - We use this to confirm ownership of the account if the owner loses the password and email or asks to close an account.",
-    "faq.privacyGender":"gender",
-    "faq.privacyEmail":"contact email address - If the account holder is younger than 16, we ask for the email address of their parent or guardian. We do not send email to this address except when someone requests to have the account password reset.",
-    "faq.accountPublicInfo":"The username and country of the account holder are displayed publicly on their profile page. The birth month / year, email address, and gender associated with the account are not displayed publicly. We collect this info so we can know the age and gender of our users in aggregate, and for research purposes. We do not sell or rent information about our users to anyone.",
-    "faq.dataCollectionTitle":"What data is collected from people while they use the website?",
-    "faq.dataCollectionOne":"When a user logs in, the Scratch website asks their browser to put an <a href=\"http://en.wikipedia.org/wiki/HTTP_cookie\">http cookie</a> on their computer in order to remember that they are logged in while they browse different pages. We collect some data on where users click and which parts of the site they visit using Google Analytics. This \"click data\" helps us figure out ways to improve the website.",
-    "faq.dataCollectionTwo":"Some of the information and data collected on the Scratch website are used in research studies intended to improve our understanding of how people learn with Scratch. The results of this research are shared with educators and researchers through conferences, journals, and other publications. You can find out more on our <a href=\"/info/research\">Research page</a>.",
-    "faq.rentInfoTitle":"Does the Scratch Team sell or rent information about users of Scratch to anyone?",
-    "faq.rentInfoBody":"No.",
-    "faq.viewUnsharedTitle":"Can the Scratch Team view unshared projects on my 'My Stuff' page?",
-    "faq.viewUnsharedBody":"Since the Scratch Team is responsible for moderation, we have access to all content stored on the Scratch website - including unshared projects. If you prefer to work on projects in complete privacy, you can use either the <a href=\"/scratch2download\">Scratch 2.0 offline editor</a> or <a href=\"/scratch_1.4\">Scratch 1.4</a>.",
-    "faq.remixDefinitionTitle":"What is a remix?",
+	"faq.aboutScratch3Title":"What is Scratch 3.0?",
+    "faq.aboutScratch3Body":"Scratch 3.0 is the latest generation of Scratch, launched on January 2, 2019. It is designed to expand how, what, and where you can create with Scratch. It includes dozens of new sprites, a totally new sound editor, and many new programming blocks. And with Scratch 3.0, you’re able to create and play projects on your tablet, in addition to your laptop or desktop computer.",
+	"faq.reportBugsScratch3Title":"How can I report bugs and share feedback on Scratch 3.0?",
+    "faq.reportBugsScratch3Body":"You can report bugs and share feedback in the <a href=\"https://scratch.mit.edu/discuss/3/\">Bugs & Glitches</a> section of the Scratch discussion forums.",
+	"faq.languagesScratch3Title":"Is Scratch 3.0 available in multiple languages?",
+    "faq.languagesScratch3Body":"Yes. To change the language of the programming blocks, click on the “globe” icon in the top navigation bar of the programming editor, then click on the dropdown menu to select a language.<br /><br />All of our translations are done by volunteers. The Scratch 3.0 editor has already been translated into 40+ languages. You can view all the languages currently being translated and reviewed on our <a href=\"https://www.transifex.com/llk/scratch-editor/\">translation server</a>. If you want to help with translation or review, please contact <a href=\"mailto:ranslate@scratch.mit.edu\">translate@scratch.mit.edu</a>.",
+	"faq.removedBlocksScratch3Title":"Does Scratch 3.0 remove any coding blocks from earlier versions of Scratch?",
+    "faq.removedBlocksScratch3Body":"No coding blocks have been removed in Scratch 3.0, but some have changed a bit and others have moved into \"Extensions\" (as described below, under \"Where did the Pen blocks go?..\").",
+	"faq.newBlocksScratch3Title":"Does Scratch 3.0 introduce new blocks?",
+    "faq.newBlocksScratch3Body":"Yes! In Scratch 3.0 you’ll find:",
+	"faq.newBlocksSoundEffect":"New \"sound effect\" blocks",
+	"faq.newBlocksOperators":"New operators that make it easier to work with text (strings)",
+	"faq.newBlocksPen":"New pen blocks, including support for transparency",
+	"faq.newBlocksGlide":"New glide block to move easily to a sprite (or random point)",
+	"faq.newBlocksExtensions":"Many new capabilities through \"Scratch Extensions\" (see the Extensions section below)",
+	"faq.biggerBlocksScratch3Title":"Why are the blocks bigger in Scratch 3.0 than in earlier versions?",
+    "faq.biggerBlocksScratch3Body":"In order to make Scratch 3.0 work well on touch devices (like many Chromebooks, Windows Surface laptops, and tablets), we needed to make the blocks bigger, so that it’s easier to drag and tap the blocks. In addition, blocks are slightly bigger in Scratch 3.0 to help address issues we observed with new users having trouble clicking and dragging small interface elements.",
+	"faq.extensionsScratch3Title":"Where did the Pen blocks go? Where did the Music blocks go? Where did the Video Sensing blocks go?",
+    "faq.extensionsScratch3Body":"The Pen, Music, and Video Sensing blocks have been moved into extensions. Extensions can be added by clicking the button on the bottom left of the screen (see the \"Extensions\" section below).",
+	"faq.paintEditorScratch3Title":"What are the new features in the Paint Editor?",
+    "faq.paintEditorScratch3Body":"The Paint Editor has been redesigned to provide powerful new features while also making it easier to use. Changes and new features include:",
+	"faq.paintEditorLayout":"New layout that makes available tools and options more visible",
+	"faq.paintEditorTools":"New tools such as an \"eraser\" that works in vector mode",
+	"faq.paintEditorColors":"More options for selecting and adjusting colors",
+	"faq.paintEditorVector":"More control over vector points (curve handles and point modes)",
+	"faq.paintEditorLayers":"Additional controls for ordering layers (\"bring to front\", \"move to back\", etc.)",
+	"faq.paintEditorGradients":"New gradient controls",
+	"faq.soundEditorScratch3Title":"What are the new features in the Sound Editor?",
+    "faq.soundEditorScratch3Body":"The Sound Editor has been redesigned to make it easier to record and manipulate sounds. It offers a number of new features:",
+	"faq.soundEditorRecording":"New layout that makes available tools and options more visible",
+	"faq.soundEditorTrimming":"New tools such as an \"eraser\" that works in vector mode",
+	"faq.soundEditorEffects":"More options for selecting and adjusting colors",
+	"faq.soundEditorVector":"More control over vector points (curve handles and point modes)",
+	"faq.soundEditorLayers":"Additional controls for ordering layers (\"bring to front\", \"move to back\", etc.)",
+	"faq.paintEditorGradients":"New gradient controls",
+	"faq.tipsWindwScratch3Title":"What happened to the Scratch Tips Window?",
+    "faq.tipsWindowScratch3Body":"Instead of the Tips Window, Scratch 3.0 provides similar material through the Tutorials Library, which can be accessed through the <i>Tutorials</i> link in the top navigation bar in the programming editor. You’ll find tutorials for entire projects (like \"Make a Chase Game\") or specific blocks and features (such as \"Record a Sound\" or \"Make it Spin\"). More tutorials will be added soon (such as \"Pong Game\" and \"Make It Fly\").",
+	"faq.remixDefinitionTitle":"What is a remix?",
     "faq.remixDefinitionBody":"When a Scratcher makes a copy of someone else’s project and modifies it to add their own ideas (for example, by changing scripts or costumes), the resulting project is called a \"remix\". Every project shared to the Scratch website can be remixed. We consider even a minor change to be a valid remix, as long as credit is given to the original project creator and others who made significant contributions to the remix.",
     "faq.remixableTitle":"Why does the Scratch Team require that all projects be “remixable”?",
-    "faq.remixableBody":"We believe that viewing and remixing interesting projects is a great way to learn to program, and leads to cool new ideas. That’s why the source code is visible for every project shared to the Scratch website.",
+    "faq.remixableBody":"We believe that remixing other people’s projects is a great way to learn to program and to create interesting projects. Through remixing, creative ideas spread through the Scratch community, and everyone benefits. All projects shared on the Scratch website are covered by the “Creative Commons Share Alike” license, which means that you can remix any project you see on the Scratch website -- and everyone else can remix any of the projects that you share on the website.",
     "faq.creativeCommonsTitle":"What if I don’t want others to remix my projects?",
-    "faq.creativeCommonsBody":"By publishing your project on the Scratch website, you agree to license it under a <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">Creative Commons Share Alike</a> license. If you don’t want others to view and remix your creations, don’t share them on the Scratch website.",
+    "faq.creativeCommonsBody":"Remixing is an important part of the Scratch community. If you don’t want others to view or remix your creations, you can still create projects on the Scratch website, but don’t share them on the website.",
     "faq.fairUseTitle":"Can I use images / sounds / media from the internet in my projects?",
-    "faq.fairUseBody":"It's important to respect the original creator’s wishes regarding remixing. If you choose to integrate someone else’s work into your own, be sure to give them credit on the project “credits” section, and include a link back to the original. To find art / sounds that are already licensed for remixing, check out the <a href=\"http://search.creativecommons.org/\">Creative Commons search page</a>.",
-    "faq.confirmedAccountTitle":"What is a “confirmed” Scratch account?",
-    "faq.confirmedAccountBody":"A confirmed account on Scratch lets you share projects, write comments, and create studios. Confirming your account also lets you receive email updates from the Scratch Team.",
+    "faq.fairUseBody":"If you choose to integrate someone else’s work into your own, be sure to give them credit on the project “credits” section, and include a link back to the original. To find art / sounds that are already licensed for remixing, check out the <a href=\"http://search.creativecommons.org/\">Creative Commons search page</a>.",
+    "faq.whyAccountTitle":"Why is it useful to have a Scratch account?",
+    "faq.whyAccountBody":"Even without an account, you can play other people’s projects, read comments and forums, and even create your own projects. But you need an account to save and share projects, write comments and forum posts, and participate in other \"social\" activities in the community (like \"loving\" other people’s projects).",
+    "faq.createAccountTitle":"How can I create an account?",
+    "faq.createAccountBody":"Just click <i>Join</i> on the Scratch home page. You’ll need to respond to a few questions, and provide an email address. It takes just a couple minutes, and it’s totally free!",
     "faq.checkConfirmedTitle":"How can I check whether my account has been confirmed?",
-    "faq.checkConfirmedBody":"To check whether your account is confirmed, you must first log into your Scratch account in the top right of the screen. Once logged in, click on your username in the top right and select \"Account Settings\", then \"Email\" on the left hand side. Confirmed email addresses will show a small green checkmark. Otherwise, you will see the text \"Your email address is unconfirmed\" in orange.",
     "faq.howToConfirmTitle":"How do I confirm my account?",
-    "faq.howToConfirmBody":"After registering for Scratch, you will receive an email with a link to confirm your account. If you cannot find the email, check your Spam folder. To resend the email, go to your Account Settings, click the Email tab, and follow the instructions there. Please note that it may take up to an hour for the email to arrive. If you still don't see the email after an hour, <a href=\"/contact-us\">let us know</a>.",
+    "faq.howToConfirmBody":"After you create a new account on Scratch, you’ll receive an email message with a link. Just click the link to confirm your account. Once you confirm your account, you’ll be able to share projects, write comments, and create studios. Confirming your account also lets you receive email updates from the Scratch Team. If you cannot find the email with the confirmation link, check your Spam folder. If you still can’t find it, and want to receive another copy, go to your Account Settings, click the Email tab, and follow the instructions there. Please note that it may take up to an hour for the email to arrive. If you still don't see the email after an hour, <a href=\"/contact-us\">let us know</a>.",
+    "faq.checkConfirmedBody":"To check whether your account is confirmed, login to your Scratch account and go to your <a href=\"/accounts/email_change/\">Email Settings</a> page. Confirmed email addresses will show a small green checkmark. Otherwise, you will see the text \"Your email address is unconfirmed\" in orange.",
     "faq.requireConfirmTitle":"Do I have to confirm my account?",
-    "faq.requireConfirmBody":"You can still use many aspects of Scratch without confirming your account, including creating and saving projects (without sharing them). Note: If you created an account before February 11, 2015, then you can still use social features on Scratch without confirming your account.",
-    "faq.forgotPasswordTitle":"I forgot my password. How can I reset it?",
-    "faq.forgotPasswordBody":"Enter your account name on the <a href=\"/accounts/password_reset/\">password reset page</a>. The website will send an email to the address associated with the account containing a link you can use to reset your password.",
+    "faq.requireConfirmBody":"You can still use many aspects of Scratch without confirming your account, including creating and saving projects (without sharing them).",
+    "faq.forgotPasswordTitle":"I forgot my username or password. How can I reset it?",
+    "faq.forgotPasswordBody":"Enter your username or email address on the <a href=\"/accounts/password_reset/\">Password Reset</a> page. The website will send an email to the address associated with your username and a link you can use to reset your password.",
     "faq.changePasswordTitle":"How do I change my password?",
-    "faq.changePasswordBody":"Go to the Scratch website, login, and then click your username in the upper right corner of the window. Choose \"account settings\", and click the link to change your password.",
+    "faq.changePasswordBody":"Login to your Scratch account, then visit our <a href=\"/accounts/password_change/\">Password Settings</a> page where you can change your password.",
     "faq.changeEmailTitle":"How do I change my email address?",
-    "faq.changeEmailBody":"Go to the Scratch website, login, and then click your username in the upper right corner of the window. Choose \"account settings\", and click the link to change your email.",
+    "faq.changeEmailBody":"Login to your Scratch account, then visit our <a href=\"/accounts/email_change/\">Email Settings</a> page where you can change your email address.",
     "faq.newScratcherTitle":"How do I transition from 'New Scratcher' to 'Scratcher'?",
-    "faq.newScratcherBody":"Make and share projects, comment helpfully on other Scratcher's projects, and be patient! After a few weeks of being active, a link will appear on your profile page inviting you to become a Scratcher. (Note that we don't promote New Scratchers to Scratcher on request - even when bribed with fancy chocolates.)",
+    "faq.newScratcherBody":"When you create an account, you’ll be labelled as a “New Scratcher.” To make the transition to \"Scratcher\", you should make and share projects, comment helpfully on other Scratchers’ projects, and be patient! After you’ve met the requirements, a link will appear on your profile page inviting you to become a Scratcher, and you’ll have some additional capabilities on the Scratch website. (Note that we don't promote New Scratchers to Scratcher on request )",
     "faq.multipleAccountTitle":"Can I have more than one account?",
-    "faq.multipleAccountBody":"It's fine to have a few accounts on the Scratch website, as long as none of them are used to break the Community Guidelines. In that case, all related accounts may be blocked or deleted.",
+    "faq.multipleAccountBody":"It's fine to have a few accounts on the Scratch website, as long as none of them are used to break the <a href=\"/community_guidelines\">Community Guidelines</a>. In that case, all related accounts may be blocked or deleted.",
     "faq.multipleLoginTitle":"Is it OK to have more than one person logged into an account?",
-    "faq.multipleLoginBody":"This is discouraged, because the website and project editor can easily get confused when more than one person is logged into the same account.",
+    "faq.multipleLoginBody":"This is not allowed because the website and project editor can easily get confused when more than one person is logged in to the same account. When an account does something that violates the <a href=\"/community_guidelines\">Community Guidelines</a>, all related accounts may be blocked or deleted. If you share an account with someone who does something bad with it, this means your accounts can be blocked for what the other person did.",
     "faq.changeUsernameTitle":"Can I change my username?",
-    "faq.changeUsernameBody":"The structure of the Scratch website depends on having a consistent account name, so it’s not possible to change your username. If you really need to, you can make a new account - but you'll have to copy your projects over on your own.",
+    "faq.changeUsernameBody":"The structure of the Scratch website depends on having a consistent account name, so it’s not possible to change your username. If you really need to switch to a new username, you can make a new account, but you'll have to copy your projects over to the new account on your own.",
     "faq.shareInfoTitle":"What information can I share on / with my account?",
-    "faq.shareInfoBody":"Please don’t share personal contact information, such as your physical address, email, phone number, or anything else that can be used to make contact outside of the Scratch website. Please report projects, comments, or forum posts that contain this kind of information so the Scratch team can remove it, and remind the author of our policy.",
+    "faq.shareInfoBody":"Please don’t share personal contact information, such as your physical address, email, phone number, or anything else that can be used to make contact outside of the Scratch website. Please report projects, comments, or forum posts that contain this kind of information, so the Scratch Team can remove the information, and remind the author of our policy against sharing personal contact information.",
     "faq.deleteAccountTitle":"How do I delete my account?",
-    "faq.deleteAccountBody":"Log in to Scratch, and then click your username in the top right-hand corner. Select “Account Settings,” then click the <em>“I want to delete my account”</em> link at the bottom of the page.",
-    "faq.scratchFreeTitle":"Is Scratch free?",
-    "faq.scratchFreeBody":"Yes! Scratch is available free of charge. You can use it in your school, and you can teach a course about it (even a course that costs money). You don't need to buy a license - it's free.",
+    "faq.deleteAccountBody":"Login to Scratch, and then click your username in the top right-hand corner. Select <i>Account Settings</i>, then click the <i>I want to delete my account</i> link at the bottom of the page. But you should only do this if you are absolutely sure that you want to delete your account.",
+    "faq.scratchFreeTitle":"Is Scratch free? Can I use it wherever I want?",
+    "faq.scratchFreeBody":"Yes! Scratch is available free of charge. You can use it in your school, and you can teach a course about it (even a course that costs money). You don't need to buy a license: it's free!",
     "faq.scratchScreenshotTitle":"Can I use screenshots of Scratch in a book or presentation?",
-    "faq.scratchScreenshotBody":"Yes, you can write a book or chapter about Scratch. You may create screenshots / images of the Scratch application and website, and consider them to be licensed under the <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">Creative Commons Attribution-ShareAlike license</a>. We ask that you include a note on your materials that says, \"Scratch is developed by the Lifelong Kindergarten Group at the MIT Media Lab. It is available for free at https://scratch.mit.edu\".",
+    "faq.scratchScreenshotBody":"Yes, you can use screenshots / images of the Scratch application and website in a book or presentation, and consider them to be licensed under the <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">Creative Commons Attribution-ShareAlike</a> license. We ask that you include a note somewhere in your materials  saying: \"Scratch is a project of the Scratch Foundation, in collaboration with the Lifelong Kindergarten Group at the MIT Media Lab. It is available for free at https://scratch.mit.edu\".",
     "faq.scratchDescriptionTitle":"Can I include a description of Scratch in brochures or other materials?",
-    "faq.scratchDescriptionBody":"Sure! We recommend the following description: \"Scratch is a programming language and online community where you can create your own interactive stories, games, and animations -- and share your creations with others around the world. In the process of designing and programming Scratch projects, young people learn to think creatively, reason systematically, and work collaboratively. Scratch is a project of the Lifelong Kindergarten group at the MIT Media Lab. It is available for free at https://scratch.mit.edu\"",
+    "faq.scratchDescriptionBody":"Sure! We recommend the following description: \"Scratch is a coding  language and online community where you can create your own interactive stories, games, and animations -- and share your creations with others around the world. As young people create and share Scratch projects, they learn to think creatively, reason systematically, and work collaboratively. Scratch is a project of the <a href=\"https://www.scratchfoundation.org/\">Scratch Foundation</a> in collaboration with the Lifelong Kindergarten group at the MIT Media Lab. It is available for free at https://scratch.mit.edu\"",
     "faq.presentScratchTitle":"Can I present Scratch at a conference?",
-    "faq.presentScratchBody":"Please feel free to make presentations about Scratch to educators or other groups. We grant our permission to make presentations.",
+    "faq.presentScratchBody":"Please feel free to make presentations about Scratch to educators or other groups.",
     "faq.supportMaterialTitle":"May I use / remix Scratch support materials, sprites, images, sounds or sample projects I’ve found on the website?",
-    "faq.supportMaterialBody":"Yes - Scratch support materials made available on the Scratch website by the Scratch Team are available under the <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">Creative Commons Attribution-ShareAlike license</a>, with the exception of the Scratch Logo, Scratch Cat, Gobo, Pico, Nano, Giga, and Tera which are Scratch trademarks.",
+    "faq.supportMaterialBody":"Yes: Most Scratch support materials on the Scratch website are available under the <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">Creative Commons Attribution-ShareAlike</a> license. There are a few exceptions: the Scratch Logo, Scratch Cat, Gobo, Pico, Nano, Giga, and Tera are Scratch trademarks, and can not be used without explicit permission from the Scratch Team.",
     "faq.sellProjectsTitle":"Can I sell my Scratch projects?",
-    "faq.sellProjectsBody":"Certainly - your project is your creation. Keep in mind that once you share your project on Scratch, everyone is free to download, remix, and reuse it as per the terms of the <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">CC-BY-SA 2.0 license</a>. So if you intend to sell your project, you may want to un-share it from Scratch.",
+    "faq.sellProjectsBody":"Yes: Your Scratch project is your creation. But keep in mind that once you share your project on the Scratch website, everyone is free to download, remix, and reuse the project based on the terms of the <a href=\"http://creativecommons.org/licenses/by-sa/2.0/deed.en\">Creative Commons Attribution-ShareAlike</a> license. So if you intend to sell your project, you may want to un-share it from the Scratch website.",
     "faq.sourceCodeTitle":"Where can I find the source code for Scratch?",
-    "faq.sourceCodeBody":"The source code for the Scratch 2 editor can be found on <a href=\"https://github.com/LLK/scratch-flash\">GitHub</a>. The source code for <a href=\"/scratch_1.4\">Scratch 1.4</a>, written in Squeak, is also available on <a href=\"https://github.com/LLK/Scratch_1.4\">GitHub</a>. For updated information on development projects relating to the Scratch website, please visit our <a href=\"/developers\">Developer Page</a>.",
+    "faq.sourceCodeBody":"The source code for the Scratch programming editor can be found on <a href=\"https://github.com/LLK/scratch-gui\">GitHub</a>. The source code for <a href=\"https://github.com/LLK/scratch-flash\">Scratch 2.0</a> and <a href=\"https://github.com/LLK/Scratch_1.4\">Scratch 1.4</a>, are also available on GitHub. For updated information on development projects relating to the Scratch website, please visit our <a href=\"/developers\">Scratch Developer Page</a>.",
     "faq.okayToShareTitle":"How do I know what is or isn’t okay to share on the Scratch website?",
     "faq.okayToShareBody":"Check out the <a href=\"/community_guidelines\">Scratch community guidelines</a> - they’re brief and don’t include a lot of legal stuff. There’s a link at the bottom of every page on Scratch.",
     "faq.reportContentTitle":"What do I do if I see something that’s inappropriate?",
-    "faq.reportContentBody":"You can click the link that says “report” on any project, comment, discussion post, or user page where you think something isn't ok for Scratch. If the situation is complicated, you can use the Contact Us link to explain. Be sure to include as much detail as you can, with links to relevant pages.",
+    "faq.reportContentBody":"You can click the link that says <i>report</i> on any project, comment, discussion post, studio, or profile page where you see something that isn't ok for Scratch. If the situation is complicated, you can use the <a href=\"/contact-us\">Contact Us</a> link (available at the bottom of every page) to explain. Be sure to include as much detail as you can, with links to relevant pages.",
     "faq.noFlameTitle":"What do I do if I see someone being mean or disrespectful?",
     "faq.noFlameBody":"Don’t add to the flames! Responding to mean comments with more mean comments just makes things worse, and could result in your account being blocked. Instead, simply report anything that is disrespectful or unconstructive, and we’ll follow up with the author. We check reports every day, multiple times per day - so rest assured, we'll sort things out.",
     "faq.reviewContentTitle":"What does the Scratch team do when something is reported or flagged?",
-    "faq.reviewContentBody":"The Scratch Team reviews reported comments and projects every day. If something breaks the Scratch community guidelines, we may remove it and send a warning to the account. Depending on how bad it is (or if we’ve already warned the account), we may also block the accounts or networks that were used to share it.",
+    "faq.reviewContentBody":"The Scratch Team reviews reported comments and projects every day. If something breaks the <a href=\"/community_guidelines\">Scratch Community Guidelines</a>, we will remove it and send a warning to the account. We may also block the accounts or networks that were used to share it, depending on what was shared and if the person has been sent warnings before",
     "faq.blockedAccountTitle":"What happens when an account is blocked?",
-    "faq.blockedAccountBody":"When an account is blocked, the owner can no longer access it, or use it to create projects or comments. When they login, they see a page that explains why the account was blocked with a web form they can use to request to be unblocked. If the owner can show that they understand why their account was blocked, and promises to follow the community guidelines in the future, the  Scratch Team will review their case. Accounts will only be unblocked in cases where the account owner’s word can be trusted. Otherwise, the account (and most likely other accounts owned or created by that person) may be blocked permanently.",
-    "faq.stolenAccountTitle":"My mean brother / Kaj / some other bad guy stole my account and got it banned, what do I do?",
-    "faq.stolenAccountBody":"You are responsible for keeping your password secure. If someone in real life takes control of your account and does bad stuff, tell the adults in charge of the computers. If you think someone you don’t know got access to your account, change the password and / or use the contact us link to explain the situation. If you got blocked for doing something that broke the community guidelines, don't just say you got hacked. If we can't trust you, we won't unblock you.",
-    "faq.cloudDataInfoTitle":"What is cloud data?",
-    "faq.cloudDataInfoBody":"Cloud data is a feature in Scratch 2 that allows for data from a project to be saved and shared online. You can use cloud data to make surveys and other projects that store numbers over time.",
-    "faq.storedCloudInfoTitle":"Who can see the data stored in cloud data?",
-    "faq.storedCloudInfoBody":"When you interact with a project using cloud data blocks, your information can be stored along with your username, and others can view it. Each project keeps a log of who interacted with it and any data they shared.",
-    "faq.onlyNumbersTitle":"Why is cloud data currently limited to only numbers -- with no strings or lists?",
-    "faq.onlyNumbersBody":"The current site is limited to numbers in variables as an initial step to work out any issues with their use on the site. We plan to roll out cloud data features incrementally. If the infrastructure is working well, we plan to add other features (cloud lists, support for strings, etc.).",
-    "faq.reportCloudTitle":"If I see someone post inappropriate content using cloud data, how do I report it?",
-    "faq.reportCloudBody":"Click the \"Report this\" button (under on the project player) to report inappropriate content in cloud data. The report form includes a link to a log of all cloud data in that project and who left it - you may want to take look at it before sending your report. Make sure that you mention \"cloud data\" when you type your reason in the report.",
-    "faq.chatRoomTitle":"Can I make chat rooms with cloud data?",
-    "faq.chatRoomBody":"While it is technically possible to create chat rooms with cloud data, they are not currently allowed. We will reconsider this policy once we have a better sense of our capability for moderating and managing reports on cloud data.",
-    "faq.makeCloudVarTitle":"How do I add a cloud variable when I'm making a project?",
-    "faq.makeCloudVarBody":"When you make a variable, you can check the box that says \"Cloud variable\". Any data you store will be saved on the server and visible to others.",
+    "faq.blockedAccountBody":"When an account is blocked, the owner can no longer access their account, use it to create projects, or post new comments. When they login, they see a page that explains why the account was blocked, along with a web form they can use to request to be unblocked. If the owner can show that they understand why their account was blocked, and promises to follow the <a href=\"/community_guidelines\">Scratch Community Guidelines</a> in the future, they will be unblocked.",
+    "faq.stolenAccountTitle":"Someone got access to my account and got my account blocked. What do I do?",
+    "faq.stolenAccountBody":"You are responsible for keeping your password secure. If someone you know took control of your account and did bad things, tell the adults in charge of the computer they used. If you think someone you don’t know has access to your account, change the password and / or use the <a href=\"/contact-us\">Contact Us</a> link to explain the situation. If your account was blocked for doing something that you did which broke the <a href=\"/community_guidelines\">Scratch Community Guidelines</a>, please don’t tell us that someone else did it. When people tell us someone else used their account to do something bad, we then need to try and talk to that person before we can restore the account. This means your account will just stay blocked for a lot longer than if you are honest with us about what happened.",
+    "faq.aboutExtensionsTitle":"What are extensions?",
+    "faq.aboutExtensionsBody":"In the Scratch editor, you can add collections of extra blocks called \"extensions.\" For example, there are extensions that enable you to program physical devices (such as micro:bit and LEGO robotics kits) and to translate text within your Scratch projects. We will continue to add new extensions over time, so what you can do with Scratch will continue to grow over time. ",
+    "faq.howToAddExtensionsTitle":"How do I add an extension to a project?",
+    "faq.howToAddExtensionsBody":"If you click on the <i>Extensions</i> button in the bottom left corner of the Scratch programming editor, you will see a listing of all Scratch Extensions. When you select one of the extensions, a new category of blocks will be added to your project. The extension will be automatically loaded each time your project is opened. You can add multiple extensions to the same project.",
+    "faq.createExtensionsTitle":"How do I create my own extension for Scratch",
+    "faq.createExtensionsBody":"If you click on the <i>Extensions</i> button in the bottom left corner of the Scratch programming editor, you will see a listing of all Scratch Extensions. When you select one of the extensions, a new category of blocks will be added to your project. The extension will be automatically loaded each time your project is opened. You can add multiple extensions to the same project.",
+    "faq.scratchXTitle":"What will happen to the ScratchX website?",
+    "faq.scratchXBody":"The ScratchX website (scratchx.org) was an experimental testbed for extensions. Extensions created for ScratchX are not compatible with Scratch 3.0. Once experimental extensions are fully supported in Scratch we will discontinue support for ScratchX and provide developers and users time to transition off of ScratchX to the new extensions platform.",
+    "faq.cloudDataInfoTitle":"What are cloud variables?",
+    "faq.cloudDataInfoBody":"Cloud variables allow for data from a project to be saved and shared with other people in the Scratch community. You can use cloud variables to make surveys and other projects where others in the community to access and modify the data over time.",
+    "faq.makeCloudVarTitle":"How can I make a cloud variable?",
+    "faq.makeCloudVarBody":"Go to the <i>Variables</i> section of the blocks palette, select <i>Make a Variable</i>, and then click the checkbox next to <i>Cloud variable (stored on server)</i>. The data associated with your cloud variable will be stored on the server, preserved over time, and accessible to anyone who opens the project.",
+    "faq.onlyNumbersTitle":"What types of data can be stored in cloud variables?",
+    "faq.onlyNumbersBody":"Only numbers can be stored in cloud variables.",
+    "faq.storedCloudInfoTitle":"Who can see the data stored in cloud variables?",
+    "faq.storedCloudInfoBody":"When you interact with a project using cloud variables, the data associated with your interactions can be stored along with your username, and others can view it.",
+     "faq.reportCloudTitle":"If I see someone post inappropriate content using cloud variables, how do I report it?",
+    "faq.reportCloudBody":"Click the <i>Report this</i> button (under on the project player on the project page) to report inappropriate content in cloud variables. Make sure that you mention \"cloud variables\" when you type your reason in the report.",
+    "faq.chatRoomTitle":"Can I make chat rooms with cloud variables?",
+    "faq.chatRoomBody":"While it is technically possible to create chat rooms with cloud variables, they are not allowed on the Scratch website.",
     "faq.changeCloudVarTitle":"Who can change the information in a cloud variable?",
-    "faq.changeCloudVarBody":"Only your project can store data in its cloud variable. If people change or remix your code, it creates a different variable in their project with the same name.",
-    "faq.newScratcherCloudTitle":"I am logged in, but I still cannot use projects with cloud data. What is going on?",
-    "faq.newScratcherCloudBody":"You need to have become a \"Scratcher\" on the website to have access to cloud data. You can become a Scratcher through actively participating on the website.",
-    "faq.multiplayerTitle":"Is it possible to make multiplayer games with cloud data?",
-    "faq.multiplayerBody":"Multiplayer games may be difficult to create, due to network speed and synchronization issues. However, some Scratchers are coming up with creative ways to use the cloud data for turn-by-turn and other games.",
-    "faq.cloudLagTitle":"How long does it take for cloud data to reach another Scratcher?",
-    "faq.cloudLagBody":"It depends. If both Scratchers have a reasonably fast Internet connection (DSL/Cable), and there are no restrictive firewalls on the computers/network, updates should be transmitted in milliseconds. However, a lot of computers have firewall software running in them, and if the firewall software blocks outgoing connections to TCP port 531 and TCP port 843, the time-lag becomes one-second. We are currently trying to figure out ways in which we can work around this limitation.",
+    "faq.changeCloudVarBody":"Only you and viewers of your project can store data in your project’s cloud variables. If people <i>see inside</i> or remix your code, it creates a copy of the variable and does not affect or change the original variable.",
+    "faq.newScratcherCloudTitle":"I am logged in, but I cannot use projects with cloud variables What is going on?",
+    "faq.newScratcherCloudBody":"If you are still a \"New Scratcher\" on the website, you will not be able to use projects with cloud variables. You need to become a \"Scratcher\" to have access to cloud variables. See the Accounts section (above) for more information about the transition from “New Scratcher” to \"Scratcher\".",
+    "faq.multiplayerTitle":"Is it possible to make multiplayer games with cloud variables?",
+    "faq.multiplayerBody":"Multiplayer games may be difficult to create, due to network speed and synchronization issues. However, some Scratchers are coming up with creative ways to use the cloud variables for turn-by-turn and other types of games.",
     "faq.schoolsTitle":"Scratch in Schools",
     "faq.howTitle":"How is Scratch used in schools?",
-    "faq.howBody":"Scratch is used in thousands of schools around the world, in many different subject areas (including language arts, science, history, math, and computer science). You can learn more about strategies and resources for using Scratch in schools and other learning environments (such as museums, libraries, and community centers) on our <a href=\"/educators\">Educators Page</a>. You can also join the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd</a> online community for educators, which is managed by our friends at the Harvard Graduate School of Education.",
-    "faq.ageTitle":"What is the age range for Scratch?",
-    "faq.ageBody":"Scratch was developed especially for young people 8 to 16 years old, so it is used most often in elementary schools and middle schools, but people of all ages create and share Scratch projects. Scratch is even used in some introductory computer-science courses in colleges. Younger children may want to try <a href=\"//www.scratchjr.org/\">ScratchJr</a>, a simplified version of Scratch designed for ages 5 to 7.",
+    "faq.howBody":"Scratch is used in hundreds of thousands of schools around the world, in many different subject areas (including language arts, science, history, math, and computer science). You can learn more about strategies and resources for using Scratch in schools and other learning environments (such as museums, libraries, and community centers) on our <a href=\"/educators\">Educators Page</a>.",
     "faq.noInternetTitle":"Is there a way for students to use Scratch without an internet connection?",
-    "faq.noInternetBody":"Yes. The Scratch <a href=\"/scratch2download\">Offline Editor</a> is a version of Scratch that runs on a desktop or laptop computer. Currently, the Offline Editor is available for Mac and Windows machines.",
+    "faq.noInternetBody":"Yes. <a href=\"/download\">Scratch Desktop</a> is a version of Scratch that runs on a desktop or laptop computer. Currently, Scratch Desktop is available for Mac and Windows machines.",
     "faq.communityTitle":"Can I turn off the online community for my students?",
-    "faq.communityBody":"The Scratch online community provides a way for young people to share, collaborate, and learn with their peers within a moderated community governed by Community Guidelines. However, we understand that some educators prefer that their students not participate in an online community. These educators may wish to install the Scratch Offline Editor, which runs offline and locally on a desktop or laptop computer.",
+    "faq.communityBody":"The Scratch online community provides a way for young people to share, collaborate, and learn with their peers within a moderated community governed by the <a href=\"/community_guidelines\">Scratch Community Guidelines</a>. However, we understand that some educators prefer that their students not participate in an online community. These educators may wish to install Scratch Desktop, which runs offline and locally on a desktop or laptop computer.",
     "faq.teacherAccountTitle":"What is a Scratch Teacher Account?",
-    "faq.teacherAccountBody":"A Scratch Teacher Account provides teachers and other educators with additional features to manage student participation on Scratch, including the ability to create student accounts, organize student projects into studios, and monitor student comments.",
+    "faq.teacherAccountBody":"A Scratch Teacher Account provides teachers and other educators with additional features to manage student participation on Scratch, including the ability to create student accounts, organize student projects into studios, and monitor student comments. For more information on Scratch Teacher Accounts, see the <a href=\"/educators/faq\">Scratch Teacher Account FAQ</a>.",
     "faq.requestTitle":"How do I request a Scratch Teacher Account?",
     "faq.requestBody":"You may request a Scratch Teacher Account from the <a href=\"/educators\">Educators Page</a> on Scratch. We ask for additional information during the registration process in order to verify your role as an educator.",
-    "faq.edTitle":"What is the difference between a Scratch Teacher Account and a ScratchEd Account?",
-    "faq.edBody":"Scratch Teacher Accounts are special user accounts on Scratch that have access to additional features to facilitate the creation and management of student accounts. ScratchEd Accounts are accounts on the <a href=\"http://scratched.gse.harvard.edu/\">ScratchEd community</a>, a separate website (managed by the Harvard Graduate School of Education) where educators share stories, exchange resources, ask questions, and meet other Scratch educators.",
     "faq.dataTitle":"What data does Scratch collect about students?",
     "faq.dataBody":"When a student first signs up on Scratch, we ask for basic demographic data including gender, age (birth month and year), country, and an email address for verification. This data is used (in aggregated form) in research studies intended to improve our understanding of how people learn with Scratch. When an educator uses a Scratch Teacher Account to create student accounts in bulk, students are not required to provide an email address for account setup.",
-    "faq.lawComplianceTitle":"Is Scratch 2.0 (online version) compliant with United States local and federal data privacy laws?",
-    "faq.lawComplianceBody":"Scratch cares deeply about the privacy of students and of all individuals who use our platform. We have in place physical and electronic procedures to protect the information we collect on the Scratch website. Although we are not in a position to offer contractual guarantees with each entity that uses our free educational product, we are in compliance with all United States federal laws that are applicable to MIT, a 501(c)(3) organization and the entity that created and maintains Scratch. We encourage you to read the Scratch Privacy Policy for more information.",
-    "faq.schoolsMoreInfo":"For more questions about Teacher Accounts, see the <a href=\"/educators/faq\">Teacher Account FAQ</a>"
+    "faq.lawComplianceTitle":"Is Scratch (online version) compliant with United States local and federal data privacy laws?",
+    "faq.lawComplianceBody":"Scratch cares deeply about the privacy of students and of all individuals who use our platform. We have in place physical and electronic procedures to protect the information we collect on the Scratch website. Although we are not in a position to offer contractual guarantees with each entity that uses our free educational product, we are in compliance with all United States federal laws that are applicable to MIT and the Scratch Foundation, the organizations that have created and maintained Scratch. We encourage you to read the Scratch Privacy Policy for more information.<br /><br />If you would like to build projects with Scratch without submitting any Personal Information to us, you can download <a href=\"/download\">Scratch Desktop</a>. Projects created in Scratch Desktop are not accessible by the Scratch Team, and using Scratch Desktop  does not disclose any personally identifying information to Scratch unless you upload these projects to the Scratch online community.</p>"
+ 
 }

From a9971b2f7b136e5a90181528d21806ed12e9f17a Mon Sep 17 00:00:00 2001
From: picklesrus <picklesrus@users.noreply.github.com>
Date: Thu, 20 Dec 2018 09:47:50 -0500
Subject: [PATCH 2/4] Fix formatting issues. Fix broken mailto. Remove
 duplicate message

---
 src/views/faq/faq.jsx   | 84 ++++++++++++++++++++---------------------
 src/views/faq/l10n.json |  5 +--
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/views/faq/faq.jsx b/src/views/faq/faq.jsx
index a5c1c0246..1ce162696 100644
--- a/src/views/faq/faq.jsx
+++ b/src/views/faq/faq.jsx
@@ -21,31 +21,31 @@ const Faq = injectIntl(props => (
 
                     <dt><FormattedMessage id="faq.makeGameTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.makeGameBody" /></dd>
-	
+
                     <dt><FormattedMessage id="faq.whoUsesScratchTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.whoUsesScratchBody" /></dd>
 
                     <dt><FormattedMessage id="faq.requirementsTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.requirementsBody" /></dd>
-					<b><FormattedHTMLMessage id="faq.requirementsDesktop" /></b>
-					<ul>
-						<li><FormattedHTMLMessage id="faq.requirementsDesktopChrome" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsDesktopEdge" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsDesktopFirefox" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsDesktopSafari" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsDesktopIE" /></li>
-                     
+                    <b><FormattedHTMLMessage id="faq.requirementsDesktop" /></b>
+                    <ul>
+                        <li><FormattedHTMLMessage id="faq.requirementsDesktopChrome" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsDesktopEdge" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsDesktopFirefox" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsDesktopSafari" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsDesktopIE" /></li>
+
                     </ul>
-					<b><FormattedHTMLMessage id="faq.requirementsTablet" /></b>
-					<ul>
-						<li><FormattedHTMLMessage id="faq.requirementsTabletChrome" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsTabletSafari" /></li>
+                    <b><FormattedHTMLMessage id="faq.requirementsTablet" /></b>
+                    <ul>
+                        <li><FormattedHTMLMessage id="faq.requirementsTabletChrome" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsTabletSafari" /></li>
                     </ul>
-					<FormattedMessage id="faq.requirementsNote" />
-					<ul>
-						<li><FormattedHTMLMessage id="faq.requirementsNoteDesktop" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsNoteWebGL" /></li>
-						<li><FormattedHTMLMessage id="faq.requirementsNoteTablets" /></li>
+                    <FormattedMessage id="faq.requirementsNote" />
+                    <ul>
+                        <li><FormattedHTMLMessage id="faq.requirementsNoteDesktop" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsNoteWebGL" /></li>
+                        <li><FormattedHTMLMessage id="faq.requirementsNoteTablets" /></li>
                     </ul>
                     <dt><FormattedMessage id="faq.offlineTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.offlineBody" /></dd>
@@ -74,37 +74,37 @@ const Faq = injectIntl(props => (
                     <dd><FormattedHTMLMessage id="faq.removedBlocksScratch3Body" /></dd>
                     <dt><FormattedMessage id="faq.newBlocksScratch3Title" /></dt>
                     <dd><FormattedHTMLMessage id="faq.newBlocksScratch3Body" /></dd>
-					<ul>
+                    <ul>
                         <li><FormattedHTMLMessage id="faq.newBlocksSoundEffect" /></li>
-						<li><FormattedHTMLMessage id="faq.newBlocksOperators" /></li>
-						<li><FormattedHTMLMessage id="faq.newBlocksPen" /></li>
-						<li><FormattedHTMLMessage id="faq.newBlocksGlide" /></li>
-						<li><FormattedHTMLMessage id="faq.newBlocksExtensions" /></li>
-                     
+                        <li><FormattedHTMLMessage id="faq.newBlocksOperators" /></li>
+                        <li><FormattedHTMLMessage id="faq.newBlocksPen" /></li>
+                        <li><FormattedHTMLMessage id="faq.newBlocksGlide" /></li>
+                        <li><FormattedHTMLMessage id="faq.newBlocksExtensions" /></li>
+
                     </ul>
-					<dt><FormattedMessage id="faq.biggerBlocksScratch3Title" /></dt>
+                    <dt><FormattedMessage id="faq.biggerBlocksScratch3Title" /></dt>
                     <dd><FormattedHTMLMessage id="faq.biggerBlocksScratch3Body" /></dd>
                     <dt><FormattedMessage id="faq.paintEditorScratch3Title" /></dt>
                     <dd><FormattedHTMLMessage id="faq.paintEditorScratch3Body" /></dd>
-					<ul>
+                    <ul>
                         <li><FormattedHTMLMessage id="faq.paintEditorLayout" /></li>
-						<li><FormattedHTMLMessage id="faq.paintEditorTools" /></li>
-						<li><FormattedHTMLMessage id="faq.paintEditorColors" /></li>
-						<li><FormattedHTMLMessage id="faq.paintEditorVector" /></li>
-						<li><FormattedHTMLMessage id="faq.paintEditorLayers" /></li>
-						<li><FormattedHTMLMessage id="faq.paintEditorGradients" /></li>
-                     
+                        <li><FormattedHTMLMessage id="faq.paintEditorTools" /></li>
+                        <li><FormattedHTMLMessage id="faq.paintEditorColors" /></li>
+                        <li><FormattedHTMLMessage id="faq.paintEditorVector" /></li>
+                        <li><FormattedHTMLMessage id="faq.paintEditorLayers" /></li>
+                        <li><FormattedHTMLMessage id="faq.paintEditorGradients" /></li>
+
                     </ul>
                     <dt><FormattedMessage id="faq.soundEditorScratch3Title" /></dt>
                     <dd><FormattedHTMLMessage id="faq.soundEditorScratch3Body" /></dd>
-					<ul>
+                    <ul>
                         <li><FormattedHTMLMessage id="faq.soundEditorRecording" /></li>
-						<li><FormattedHTMLMessage id="faq.soundEditorTrimming" /></li>
-						<li><FormattedHTMLMessage id="faq.soundEditorEffects" /></li>              
+                        <li><FormattedHTMLMessage id="faq.soundEditorTrimming" /></li>
+                        <li><FormattedHTMLMessage id="faq.soundEditorEffects" /></li>
                     </ul>
                     <dt><FormattedMessage id="faq.tipsWindwScratch3Title" /></dt>
                     <dd><FormattedHTMLMessage id="faq.tipsWindowScratch3Body" /></dd>
-                   
+
                 </dl>
             </section>
             <section id="remix">
@@ -127,16 +127,16 @@ const Faq = injectIntl(props => (
                 <dl>
                     <dt><FormattedMessage id="faq.whyAccountTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.whyAccountBody" /></dd>
-	
+
                     <dt><FormattedMessage id="faq.createAccountTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.createAccountBody" /></dd>
-	
+
                     <dt><FormattedMessage id="faq.howToConfirmTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.howToConfirmBody" /></dd>
-	
+
                     <dt><FormattedMessage id="faq.checkConfirmedTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.checkConfirmedBody" /></dd>
-                   
+
                     <dt><FormattedMessage id="faq.requireConfirmTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.requireConfirmBody" /></dd>
                     <dt><FormattedMessage id="faq.forgotPasswordTitle" /></dt>
@@ -208,7 +208,7 @@ const Faq = injectIntl(props => (
                     <dt><FormattedMessage id="faq.createExtensionsTitle" /></dt>
                     <dd><FormattedHTMLMessage id="faq.createExtensionsBody" /></dd>
                     <dt><FormattedMessage id="faq.scratchXTitle" /></dt>
-                    <dd><FormattedMessage id="faq.scratchXBody" /></dd>  
+                    <dd><FormattedMessage id="faq.scratchXBody" /></dd>
                 </dl>
             </section>
             <section id="clouddata">
@@ -259,7 +259,7 @@ const Faq = injectIntl(props => (
         <nav>
             <ol>
                 <li><a href="#about-scratch"><FormattedMessage id="faq.aboutTitle" /></a></li>
-	<li><a href="#scratch3"><FormattedMessage id="faq.scratch3Title" /></a></li>
+                <li><a href="#scratch3"><FormattedMessage id="faq.scratch3Title" /></a></li>
                 <li><a href="#remix"><FormattedMessage id="faq.remixTitle" /></a></li>
                 <li><a href="#accounts"><FormattedMessage id="faq.accountsTitle" /></a></li>
                 <li><a href="#permissions"><FormattedMessage id="faq.permissionsTitle" /></a></li>
diff --git a/src/views/faq/l10n.json b/src/views/faq/l10n.json
index f94efb6c0..81fad22a7 100644
--- a/src/views/faq/l10n.json
+++ b/src/views/faq/l10n.json
@@ -43,7 +43,7 @@
 	"faq.reportBugsScratch3Title":"How can I report bugs and share feedback on Scratch 3.0?",
     "faq.reportBugsScratch3Body":"You can report bugs and share feedback in the <a href=\"https://scratch.mit.edu/discuss/3/\">Bugs & Glitches</a> section of the Scratch discussion forums.",
 	"faq.languagesScratch3Title":"Is Scratch 3.0 available in multiple languages?",
-    "faq.languagesScratch3Body":"Yes. To change the language of the programming blocks, click on the “globe” icon in the top navigation bar of the programming editor, then click on the dropdown menu to select a language.<br /><br />All of our translations are done by volunteers. The Scratch 3.0 editor has already been translated into 40+ languages. You can view all the languages currently being translated and reviewed on our <a href=\"https://www.transifex.com/llk/scratch-editor/\">translation server</a>. If you want to help with translation or review, please contact <a href=\"mailto:ranslate@scratch.mit.edu\">translate@scratch.mit.edu</a>.",
+    "faq.languagesScratch3Body":"Yes. To change the language of the programming blocks, click on the “globe” icon in the top navigation bar of the programming editor, then click on the dropdown menu to select a language.<br /><br />All of our translations are done by volunteers. The Scratch 3.0 editor has already been translated into 40+ languages. You can view all the languages currently being translated and reviewed on our <a href=\"https://www.transifex.com/llk/scratch-editor/\">translation server</a>. If you want to help with translation or review, please contact <a href=\"mailto:translate@scratch.mit.edu\">translate@scratch.mit.edu</a>.",
 	"faq.removedBlocksScratch3Title":"Does Scratch 3.0 remove any coding blocks from earlier versions of Scratch?",
     "faq.removedBlocksScratch3Body":"No coding blocks have been removed in Scratch 3.0, but some have changed a bit and others have moved into \"Extensions\" (as described below, under \"Where did the Pen blocks go?..\").",
 	"faq.newBlocksScratch3Title":"Does Scratch 3.0 introduce new blocks?",
@@ -72,7 +72,6 @@
 	"faq.soundEditorEffects":"More options for selecting and adjusting colors",
 	"faq.soundEditorVector":"More control over vector points (curve handles and point modes)",
 	"faq.soundEditorLayers":"Additional controls for ordering layers (\"bring to front\", \"move to back\", etc.)",
-	"faq.paintEditorGradients":"New gradient controls",
 	"faq.tipsWindwScratch3Title":"What happened to the Scratch Tips Window?",
     "faq.tipsWindowScratch3Body":"Instead of the Tips Window, Scratch 3.0 provides similar material through the Tutorials Library, which can be accessed through the <i>Tutorials</i> link in the top navigation bar in the programming editor. You’ll find tutorials for entire projects (like \"Make a Chase Game\") or specific blocks and features (such as \"Record a Sound\" or \"Make it Spin\"). More tutorials will be added soon (such as \"Pong Game\" and \"Make It Fly\").",
 	"faq.remixDefinitionTitle":"What is a remix?",
@@ -178,5 +177,5 @@
     "faq.dataBody":"When a student first signs up on Scratch, we ask for basic demographic data including gender, age (birth month and year), country, and an email address for verification. This data is used (in aggregated form) in research studies intended to improve our understanding of how people learn with Scratch. When an educator uses a Scratch Teacher Account to create student accounts in bulk, students are not required to provide an email address for account setup.",
     "faq.lawComplianceTitle":"Is Scratch (online version) compliant with United States local and federal data privacy laws?",
     "faq.lawComplianceBody":"Scratch cares deeply about the privacy of students and of all individuals who use our platform. We have in place physical and electronic procedures to protect the information we collect on the Scratch website. Although we are not in a position to offer contractual guarantees with each entity that uses our free educational product, we are in compliance with all United States federal laws that are applicable to MIT and the Scratch Foundation, the organizations that have created and maintained Scratch. We encourage you to read the Scratch Privacy Policy for more information.<br /><br />If you would like to build projects with Scratch without submitting any Personal Information to us, you can download <a href=\"/download\">Scratch Desktop</a>. Projects created in Scratch Desktop are not accessible by the Scratch Team, and using Scratch Desktop  does not disclose any personally identifying information to Scratch unless you upload these projects to the Scratch online community.</p>"
- 
+
 }

From 37cb2fb7fa25bcca2ac904517fe39c8729167ea7 Mon Sep 17 00:00:00 2001
From: picklesrus <picklesrus@users.noreply.github.com>
Date: Thu, 20 Dec 2018 10:12:21 -0500
Subject: [PATCH 3/4] redirect /3faq to /info/faq/#scratch3

---
 src/routes.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/routes.json b/src/routes.json
index bcb4bd28a..b52be8429 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -170,13 +170,6 @@
         "title": "Scratch Project",
         "dynamicMetaTags": true
     },
-    {
-        "name": "3faq",
-        "pattern": "^/3faq/?$",
-        "routeAlias": "/3faq/?$",
-        "view": "preview-faq/preview-faq",
-        "title": "Scratch 3.0 FAQ"
-    },
     {
         "name": "parents",
         "pattern": "^/parents/?$",
@@ -302,6 +295,12 @@
         "view": "microbit/microbit",
         "title": "micro:bit"
     },
+    {
+        "name":"3-faq-redirect",
+        "pattern": "^/3faq/?$",
+        "routeAlias": "/3faq/?$",
+        "redirect": "info/faq#scratch3"
+    },
     {
         "name": "donate-redirect",
         "pattern": "^/info/donate/?",

From e86405560512f0bbae7f341bf0af691237cc615c Mon Sep 17 00:00:00 2001
From: picklesrus <picklesrus@users.noreply.github.com>
Date: Thu, 20 Dec 2018 10:30:12 -0500
Subject: [PATCH 4/4] Fix some duplicates

---
 src/views/faq/l10n.json | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/faq/l10n.json b/src/views/faq/l10n.json
index 81fad22a7..71617c3c0 100644
--- a/src/views/faq/l10n.json
+++ b/src/views/faq/l10n.json
@@ -67,11 +67,9 @@
 	"faq.paintEditorGradients":"New gradient controls",
 	"faq.soundEditorScratch3Title":"What are the new features in the Sound Editor?",
     "faq.soundEditorScratch3Body":"The Sound Editor has been redesigned to make it easier to record and manipulate sounds. It offers a number of new features:",
-	"faq.soundEditorRecording":"New layout that makes available tools and options more visible",
-	"faq.soundEditorTrimming":"New tools such as an \"eraser\" that works in vector mode",
-	"faq.soundEditorEffects":"More options for selecting and adjusting colors",
-	"faq.soundEditorVector":"More control over vector points (curve handles and point modes)",
-	"faq.soundEditorLayers":"Additional controls for ordering layers (\"bring to front\", \"move to back\", etc.)",
+	"faq.soundEditorRecording":"New recording system that is easier to use",
+	"faq.soundEditorTrimming":"New audio trimming system that is easier to use",
+	"faq.soundEditorEffects":"New sound effects (such as \"faster\", \"slower\", \"echo\", and \"robot\")",
 	"faq.tipsWindwScratch3Title":"What happened to the Scratch Tips Window?",
     "faq.tipsWindowScratch3Body":"Instead of the Tips Window, Scratch 3.0 provides similar material through the Tutorials Library, which can be accessed through the <i>Tutorials</i> link in the top navigation bar in the programming editor. You’ll find tutorials for entire projects (like \"Make a Chase Game\") or specific blocks and features (such as \"Record a Sound\" or \"Make it Spin\"). More tutorials will be added soon (such as \"Pong Game\" and \"Make It Fly\").",
 	"faq.remixDefinitionTitle":"What is a remix?",
@@ -141,7 +139,7 @@
     "faq.howToAddExtensionsTitle":"How do I add an extension to a project?",
     "faq.howToAddExtensionsBody":"If you click on the <i>Extensions</i> button in the bottom left corner of the Scratch programming editor, you will see a listing of all Scratch Extensions. When you select one of the extensions, a new category of blocks will be added to your project. The extension will be automatically loaded each time your project is opened. You can add multiple extensions to the same project.",
     "faq.createExtensionsTitle":"How do I create my own extension for Scratch",
-    "faq.createExtensionsBody":"If you click on the <i>Extensions</i> button in the bottom left corner of the Scratch programming editor, you will see a listing of all Scratch Extensions. When you select one of the extensions, a new category of blocks will be added to your project. The extension will be automatically loaded each time your project is opened. You can add multiple extensions to the same project.",
+    "faq.createExtensionsBody":"The Scratch Team will be publishing specifications and guidelines for extensions in the future. Once available, you will be able to submit extensions to the Scratch Team for consideration in the official Scratch 3.0 extensions library. We’ll also provide guidelines for developing and distributing \"experimental\" extensions, which can be used to create projects on individual computers, but not shared in the Scratch online community.",
     "faq.scratchXTitle":"What will happen to the ScratchX website?",
     "faq.scratchXBody":"The ScratchX website (scratchx.org) was an experimental testbed for extensions. Extensions created for ScratchX are not compatible with Scratch 3.0. Once experimental extensions are fully supported in Scratch we will discontinue support for ScratchX and provide developers and users time to transition off of ScratchX to the new extensions platform.",
     "faq.cloudDataInfoTitle":"What are cloud variables?",