Merge branch 'develop' into automod-feedback-modal

package-lock.json

@@ -20527,9 +20527,9 @@
       }
     },
     "scratch-blocks": {
-      "version": "0.1.0-prerelease.20210121045459",
-      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210121045459.tgz",
-      "integrity": "sha512-EuBPXb2z2giYsBm4WVy41ciw6chUVc02Nary6g1ruDzYyJZOTjMqn9vHTrFLFbVcWwBdm56R0ukoFyzK44Y+GA==",
+      "version": "0.1.0-prerelease.20210126063240",
+      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210126063240.tgz",
+      "integrity": "sha512-1b/SxhBLTm7f9xYwaaw4W3bXhAvsYhKIlpL7j7YLr6W3MkOSSeGGWGPR3I+2iCPgVEEUS/6f+N+xCCgvw0ny/g==",
       "dev": true,
       "requires": {
         "exports-loader": "0.6.3",
@@ -20537,9 +20537,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20210121230641",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210121230641.tgz",
-      "integrity": "sha512-iD+UepI13SbkGIzFtfh4LcnvJuyjoOsuFxnK1gsKTk3LLqWN+/fsEteXGG71o47ccqJjjuuV9uj8MAgCVdVHNg==",
+      "version": "0.1.0-prerelease.20210126085610",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210126085610.tgz",
+      "integrity": "sha512-2D7bYkUXsTXrmRNA71laWGxTp3hfxD307Zt7gvcVlbBYYJQVxOSKSfHV9f1ZDrHJoiOGIwnkgc/fhsWUMzcB6Q==",
       "dev": true,
       "requires": {
         "arraybuffer-loader": "^1.0.6",
@@ -20590,13 +20590,13 @@
         "redux": "3.7.2",
         "redux-throttle": "0.1.1",
         "scratch-audio": "0.1.0-prerelease.20200528195344",
-        "scratch-blocks": "0.1.0-prerelease.20210121045459",
-        "scratch-l10n": "3.10.20210121031534",
-        "scratch-paint": "0.2.0-prerelease.20210121055639",
+        "scratch-blocks": "0.1.0-prerelease.20210126063240",
+        "scratch-l10n": "3.10.20210126031644",
+        "scratch-paint": "0.2.0-prerelease.20210125040836",
         "scratch-render": "0.1.0-prerelease.20210115005247",
         "scratch-storage": "1.3.3",
         "scratch-svg-renderer": "0.2.0-prerelease.20210114214521",
-        "scratch-vm": "0.2.0-prerelease.20210121224335",
+        "scratch-vm": "0.2.0-prerelease.20210126041803",
         "startaudiocontext": "1.2.1",
         "style-loader": "^0.23.0",
         "text-encoding": "0.7.0",
@@ -20775,9 +20775,9 @@
           "dev": true
         },
         "electron-to-chromium": {
-          "version": "1.3.642",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz",
-          "integrity": "sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==",
+          "version": "1.3.645",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.645.tgz",
+          "integrity": "sha512-T7mYop3aDpRHIQaUYcmzmh6j9MAe560n6ukqjJMbVC6bVTau7dSpvB18bcsBPPtOSe10cKxhJFtlbEzLa0LL1g==",
           "dev": true
         },
         "file-loader": {
@@ -21014,9 +21014,9 @@
           "dev": true
         },
         "scratch-l10n": {
-          "version": "3.10.20210121031534",
-          "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20210121031534.tgz",
-          "integrity": "sha512-1jnFonkjs1zfUuT0kfsp7GwnRSM4ixEDQKRhxJubR5IDx3f/jJju/r6mFbpNarxhZ07gCaP0hy/mxjK7ItLKpA==",
+          "version": "3.10.20210126031644",
+          "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20210126031644.tgz",
+          "integrity": "sha512-VPyH8lx8dQuzqtsuuq5juht6UXco0KReA5qlDNnOLaHYXS5rsRsPqvlSyjLimiys4D1oUnj6VoMferiRDg/yaw==",
           "dev": true,
           "requires": {
             "@babel/cli": "^7.1.2",
@@ -21092,9 +21092,9 @@
       }
     },
     "scratch-l10n": {
-      "version": "3.10.20210122132044",
-      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20210122132044.tgz",
-      "integrity": "sha512-k8i2WHqa3Yb0EQW/zyZXrA4ULfMhZNGf0QIzg2boEcisGj3S8+lGbOBAuLUYskXZmsYCMCqpojOucL8NTS+DHQ==",
+      "version": "3.11.20210126195218",
+      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210126195218.tgz",
+      "integrity": "sha512-382gz4H91FqZkLXaI+LjSTcY75kXvvRI6LFMOLNzJdCAil0BZym9f4WFF7BC9VFFtaUt5qg9K8cq00QUWlTxng==",
       "dev": true,
       "requires": {
         "@babel/cli": "^7.1.2",
@@ -21104,9 +21104,9 @@
       }
     },
     "scratch-paint": {
-      "version": "0.2.0-prerelease.20210121055639",
-      "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210121055639.tgz",
-      "integrity": "sha512-WYPg+jGZaanM44R5/fVsBEnlJJiazGtwG/zVrqExZ5pUA8Sge2FbD5axyUFt7iyJOsZjAoCZ2GTWlzbH15X6rA==",
+      "version": "0.2.0-prerelease.20210125040836",
+      "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210125040836.tgz",
+      "integrity": "sha512-UQOznZr8B+yiahaWZodD+GY4zXPFCPtsMnuo+yuZAUaE82ZgrjhgWTnfi4LyXsCgoq58c3yX5jnMk5QFQHLxGw==",
       "dev": true,
       "requires": {
         "@scratch/paper": "0.11.20200728195508",
@@ -21332,9 +21332,9 @@
       "dev": true
     },
     "scratch-vm": {
-      "version": "0.2.0-prerelease.20210121224335",
-      "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210121224335.tgz",
-      "integrity": "sha512-AtcDmS5KSIMzhgqNw13tYhEb9ULjGJi7nQ/4NU7gAaCwUqg4jKHVGhUAPFcIXJxj3GSC8bIA6rSVDjjT0PCdsg==",
+      "version": "0.2.0-prerelease.20210126041803",
+      "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210126041803.tgz",
+      "integrity": "sha512-gtJeHTesTzMUBZ2XQTXABPi6QlB3ea6ITHIYCLVPAhYJt/RMD54OAiBqqkdv5vXhJYZUo7UynY6dpo9i4PrEwg==",
       "dev": true,
       "requires": {
         "@vernier/godirect": "1.5.0",

package.json

@@ -129,7 +129,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20210121230641",
+    "scratch-gui": "0.1.0-prerelease.20210126085610",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

src/views/scratch_1.4/l10n.json

 {
-  "onePointFour.intro": "The previous version of Scratch, version 1.4, is still available for download.",
+  "onePointFour.intro": "A previous version of Scratch, version 1.4, is still available for download.",
   "onePointFour.introNoteLabel": "Note:",
-  "onePointFour.introNote": "{noteLabel} You can still share projects from 1.4 to the Scratch website. However, projects created in Scratch 2.0 cannot be opened in 1.4.",
+  "onePointFour.introNote": "{noteLabel} You can still share projects from 1.4 to the Scratch website. However, projects created in newer versions of Scratch cannot be opened in 1.4.",
   "onePointFour.downloads": "Downloads",
   "onePointFour.macTitle": "Mac OS X",
   "onePointFour.macBody": "Compatible with Mac OSX 10.4 or later",
@@ -22,7 +22,7 @@
   "onePointFour.resourcesA": "For a step-by-step introduction, download the {gettingStartedGuide}. The {referenceGuide} has a thorough explanation of the Scratch interface and programming language. {scratchCards} provide brief explanations that show how to make animations and interactive projects with Scratch.",
   "onePointFour.requirementsQ": "What are the system requirements for Scratch 1.4?",
   "onePointFour.requirementsDisplay": "Display: 800 x 480 or larger, thousands or millions of colors (16-bit color or greater) ",
-  "onePointFour.requirementsOS": "Operating System: Windows 2000 or later, Mac OS X 10.4 or later, Ubuntu Linux 9.04 or later (For other versions of Linux, see the Linux Installer page) ",
+  "onePointFour.requirementsOS": "Operating System: Windows 2000 or later, Mac OS X 10.4 through 10.14, Ubuntu Linux 9.04 or later (For other versions of Linux, see the Linux Installer page) ",
   "onePointFour.requirementsDisk": "Disk: at least 120 megabytes of free space to install Scratch.",
   "onePointFour.requirementsCPUMemory": "CPU and memory: Most computers have enough memory to run Scratch 1.4, but very old computers may run Scratch slowly.",
   "onePointFour.requirementsSoundVideo": "Sound / Video: Sound playback requires speakers (or headphones), and recording requires a microphone. Many laptops have speakers and microphones built in. Scratch 1.4 can use a USB or built-in camera (optional).",