Merge pull request #7028 from LLK/release/2022-08-31

[Master] release/2022-08-31

package.json

@@ -57,7 +57,7 @@
     "react-twitter-embed": "^3.0.3",
     "react-use": "^17.3.1",
     "scratch-parser": "5.0.0",
-    "scratch-storage": "0.5.1"
+    "scratch-storage": "2.0.2"
   },
   "devDependencies": {
     "@formatjs/intl-locale": "2.4.34",
@@ -134,8 +134,8 @@
     "regenerator-runtime": "0.13.9",
     "sass": "1.49.7",
     "sass-loader": "10.2.1",
-    "scratch-gui": "0.1.0-prerelease.20220824145530",
+    "scratch-gui": "0.1.0-prerelease.20220830140542",
-    "scratch-l10n": "3.14.20220824031545",
+    "scratch-l10n": "3.14.20220826031556",
     "selenium-webdriver": "4.1.0",
     "slick-carousel": "1.6.0",
     "style-loader": "0.12.3",

src/l10n.json

@@ -430,7 +430,7 @@
     "extensions.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
     "extensions.checkOsVersionText2": "If you are using macOS 12, please update to macOS 12.3 or newer. Earlier versions of macOS 12 do not work correctly with Scratch Link.",
     "extensions.winOSVersionLinkText": "Windows",
-    "extensions.macOSVersionLinkText": "Mac OS",
+    "extensions.macOSVersionLinkText": "macOS",
     "extensions.closeScratchCopiesTitle": "Close other copies of Scratch",
     "extensions.closeScratchCopiesText": "Only one copy of Scratch can connect with the {deviceName} at a time. If you have Scratch open in other browser tabs, close it and try again.",
     "extensions.otherComputerConnectedTitle": "Make sure no other computer is connected to your {deviceNameShort}",

src/views/annual-report/2020/annual-report.jsx

@@ -1716,7 +1716,7 @@ class AnnualReport extends React.Component {
                                         />
                                     </MediaQuery>
                                     <p>
-                                        <FormattedMessage id="annualReport.2020.projectBy" /> u/STORMPRIMEX
+                                        <FormattedMessage id="annualReport.2020.projectBy" /> @STORMPRIMEX
                                     </p>
                                 </div>
                                 <a
@@ -1904,7 +1904,7 @@ class AnnualReport extends React.Component {
                                     projectBy={this.props.intl.formatMessage(
                                         {id: 'annualReport.2020.projectBy'}
                                     )}
-                                    attribution="u/lukiepie2011"
+                                    attribution="@lukiepie2011"
                                 />
                                 <img
                                     className="connector left"
@@ -2002,7 +2002,7 @@ class AnnualReport extends React.Component {
                                     projectBy={this.props.intl.formatMessage(
                                         {id: 'annualReport.2020.projectBy'}
                                     )}
-                                    attribution="u/cellie"
+                                    attribution="@cellie"
                                 />
                                 <TimelineCard
                                     className="left"
@@ -2041,7 +2041,7 @@ class AnnualReport extends React.Component {
                                     projectBy={this.props.intl.formatMessage(
                                         {id: 'annualReport.2020.projectBy'}
                                     )}
-                                    attribution="u/LGMammoth"
+                                    attribution="@LGMammoth"
                                 />
                                 <img
                                     className="connector right"
@@ -2067,7 +2067,7 @@ class AnnualReport extends React.Component {
                                     projectBy={this.props.intl.formatMessage(
                                         {id: 'annualReport.2020.projectBy'}
                                     )}
-                                    attribution="u/IDK_HAVE_SOME_NUMBER"
+                                    attribution="@IDK_HAVE_SOME_NUMBER"
                                 />
                                 <div className="illustrations">
                                     <img

src/views/boost/l10n.json

@@ -17,7 +17,7 @@
     "boost.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
     "boost.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
     "boost.winOSVersionLinkText": "Windows",
-    "boost.macOSVersionLinkText": "Mac OS",
+    "boost.macOSVersionLinkText": "macOS",
     "boost.closeScratchCopiesTitle": "Close other copies of Scratch",
     "boost.closeScratchCopiesText": "Only one copy of Scratch can connect with a BOOST at a time. If you have Scratch open in other browser tabs, close it and try again.",
     "boost.otherComputerConnectedTitle": "Make sure no other computer is connected to your sensor",

src/views/ev3/l10n.json

@@ -29,7 +29,7 @@
     "ev3.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
     "ev3.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
     "ev3.winOSVersionLinkText": "Windows",
-    "ev3.macOSVersionLinkText": "Mac OS",
+    "ev3.macOSVersionLinkText": "macOS",
     "ev3.makeSurePairedTitle": "Make sure your computer is paired with your EV3",
     "ev3.makeSurePairedText": "Your computer needs to be paired with your EV3 before it can connect to Scratch. We try to do this automatically the first time you add the EV3 extension, but if it isn't working you can try these {pairingInstructionLink}.",
     "ev3.pairingInstructionText": "bluetooth pairing instructions from LEGO",

src/views/gdxfor/l10n.json

@@ -18,7 +18,7 @@
     "gdxfor.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
     "gdxfor.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
     "gdxfor.winOSVersionLinkText": "Windows",
-    "gdxfor.macOSVersionLinkText": "Mac OS",
+    "gdxfor.macOSVersionLinkText": "macOS",
     "gdxfor.closeScratchCopiesTitle": "Close other copies of Scratch",
     "gdxfor.closeScratchCopiesText": "Only one copy of Scratch can connect with the Force and Acceleration sensor at a time. If you have Scratch open in other browser tabs, close it and try again.",
     "gdxfor.otherComputerConnectedTitle": "Make sure no other computer is connected to your sensor",

src/views/microbit/l10n.json

@@ -7,7 +7,7 @@
     "microbit.downloadCardsTitle": "Download micro:bit Cards",
     "microbit.downloadHex": "Download the Scratch micro:bit HEX file",
     "microbit.dragDropHex": "Drag and drop the HEX file onto your micro:bit",
-    "microbit.installHexAndroid": "Please follow the instructions to install the HEX file on a computer running Windows, MacOS or ChromeOS.",
+    "microbit.installHexAndroid": "Please follow the instructions to install the HEX file on a computer running Windows, macOS or ChromeOS.",
     "microbit.connectingMicrobit": "Connecting micro:bit to Scratch",
     "microbit.powerMicrobit": "Power your micro:bit with USB or a battery pack.",
     "microbit.useScratch3": "Use the {scratch3Link} editor.",
@@ -29,7 +29,7 @@
     "microbit.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
     "microbit.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
     "microbit.winOSVersionLinkText": "Windows",
-    "microbit.macOSVersionLinkText": "Mac OS",
+    "microbit.macOSVersionLinkText": "macOS",
     "microbit.closeScratchCopiesTitle": "Close other copies of Scratch",
     "microbit.closeScratchCopiesText": "Only one copy of Scratch can connect with the micro:bit at a time. If you have Scratch open in other browser tabs, close it and try again.",
     "microbit.otherComputerConnectedTitle": "Make sure no other computer is connected to your micro:bit",

src/views/preview/l10n.json

@@ -12,7 +12,7 @@
     "project.comments.header": "Comments",
     "project.comments.toggleOff": "Commenting off",
     "project.comments.toggleOn": "Commenting on",
-    "project.comments.turnedOff": "Sorry, comment posting has been turned off for this project.",
+    "project.comments.turnedOff": "Commenting for this project has been turned off.",
     "project.comments.turnedOffGlobally": "Project comments across Scratch are turned off, but don't worry, your comments are saved and will be back soon.",
     "project.share.notShared": "This project is not shared — so only you can see it. Click share to let everyone see it!",
     "project.share.sharedLong": "Congratulations on sharing your project! Other people can now try it out, give comments, and remix it.",

src/views/wedo2-legacy/l10n.json

@@ -4,7 +4,7 @@
     "wedoLegacy.getStarted": "Getting Started with LEGO WeDo 2.0",
     "wedoLegacy.installTitle": "1. Install Device Manager",
     "wedoLegacy.installText": "The Device Manager lets you connect WeDo 2.0 to Scratch using Bluetooth",
-    "wedoLegacy.downloadMac": "Download for Mac OSX",
+    "wedoLegacy.downloadMac": "Download for macOS",
     "wedoLegacy.downloadWin": "Download for Windows 10+",
     "wedoLegacy.setupTitle": "2. Setup & Help",
     "wedoLegacy.setupText": "Connect your WeDo 2.0 by following the steps in the <a href=\"/projects/editor/?tip_bar=ext2\">Tips Window</a>",

src/views/wedo2/l10n.json

@@ -20,7 +20,7 @@
     "wedo2.checkOSVersionTitle": "Make sure your operating system is compatible with Scratch Link",
     "wedo2.checkOSVersionText": "The minimum operating system versions are listed at the top of this page. See instructions for checking your version of {winOSVersionLink} or {macOSVersionLink}.",
     "wedo2.winOSVersionLinkText": "Windows",
-    "wedo2.macOSVersionLinkText": "Mac OS",
+    "wedo2.macOSVersionLinkText": "macOS",
     "wedo2.closeScratchCopiesTitle": "Close other copies of Scratch",
     "wedo2.closeScratchCopiesText": "Only one copy of Scratch can connect with the WeDo 2.0 at a time. If you have Scratch open in other browser tabs, close it and try again.",
     "wedo2.otherComputerConnectedTitle": "Make sure no other computer is connected to your WeDo 2.0",