scratch-l10n 6.0.75 → 6.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-l10n",
-  "version": "6.0.75",
+  "version": "6.1.1",
   "description": "Localization for the Scratch 3.0 components",
   "main": "./dist/l10n.js",
   "browser": "./src/index.mjs",

package/scripts/lib/pull-and-validate.mts

@@ -0,0 +1,142 @@
+import locales, { localeMap } from '../../src/supported-locales.mjs'
+import { poolMap } from './concurrent.mts'
+import { ProgressLogger } from './progress-logger.mts'
+import { TransifexStringsKeyValueJson } from './transifex-formats.mts'
+import { txPull, txResources } from './transifex.mts'
+import { filterInvalidTranslations, TransifexEditorString } from './validate.mts'
+
+const CONCURRENCY_LIMIT = 36
+const SOURCE_LOCALE = 'en' // TODO: don't hardcode this
+
+/**
+ * @param resources - A list of Transifex resource names
+ * @param selectedLocales - A list of Scratch locale codes
+ * @returns The list of all resource/locale combinations to pull. The source locale is always excluded.
+ */
+const expandResourceFiles = (resources: string[], selectedLocales: string[]) => {
+  const files = []
+  for (const resource of resources) {
+    for (const locale of selectedLocales) {
+      if (locale === SOURCE_LOCALE) {
+        continue
+      }
+      files.push({ resource: resource, locale: locale })
+    }
+  }
+  return files
+}
+
+/**
+ * Pull and validate a single Transifex "file" (resource + locale).
+ * @param o - The options for pulling and validating a single file.
+ * @param o.allStrings - All pulled strings so far, used to get source strings for validation
+ * @param o.project - The Transifex project to pull from
+ * @param o.resource - The Transifex resource to pull from
+ * @param o.locale - The locale to pull
+ * @param o.mode - The mode to use when pulling (e.g., "reviewed")
+ * @returns A list of messages about errors encountered during validation, if any.
+ */
+async function pullAndValidateFile({
+  allStrings,
+  project,
+  resource,
+  locale,
+  mode,
+}: {
+  allStrings: Record<string, Record<string, TransifexStringsKeyValueJson>>
+  project: string
+  resource: string
+  locale: string
+  mode?: string
+}) {
+  const messages: string[] = []
+  const txLocale = localeMap[locale] || locale
+  const fileContent = await txPull<TransifexEditorString>(project, resource, txLocale, mode)
+
+  // if fileContent has message & description, we only want the message
+  const translations: TransifexStringsKeyValueJson = {}
+  for (const key of Object.keys(fileContent)) {
+    const tx = fileContent[key]
+    if (typeof tx === 'string') {
+      translations[key] = tx
+    } else {
+      translations[key] = tx.message
+    }
+  }
+
+  if (!(resource in allStrings)) {
+    allStrings[resource] = {}
+  }
+  allStrings[resource][locale] = translations
+
+  // may or may not be the same as `translations`
+  const sourceStrings = allStrings[resource][SOURCE_LOCALE]
+
+  // some of the validation checks may still be relevant even if locale === SOURCE_LOCALE
+  // console.log({ resource, locale, translations, sourceStrings })
+  messages.push(...filterInvalidTranslations(locale, translations, sourceStrings))
+
+  return messages
+}
+
+/**
+ * Pull one or more resource(s) from a transifex project and validate the strings.
+ * Return any error messages from the validation process along with all valid strings.
+ * @param o - The options for pulling, validating, and saving translations.
+ * @param o.project - The Transifex project to pull translations from.
+ * @param o.mode - The mode to use when pulling translations (e.g., "reviewed").
+ * @param o.resources - The resources within the project to pull translations for.
+ * @param o.selectedLocales - The locales to pull translations for. Defaults to all supported locales.
+ * @returns Translation strings and a list of messages about errors encountered during validation, if any.
+ */
+export async function pullAndValidateProject({
+  project,
+  resources,
+  mode,
+  selectedLocales,
+}: {
+  project: string
+  mode?: string
+  resources?: string[]
+  selectedLocales?: string | string[]
+}) {
+  const selectedResources = resources ?? (await txResources(project))
+  selectedLocales =
+    typeof selectedLocales === 'string' ? [selectedLocales] : (selectedLocales ?? Object.keys(locales))
+
+  const files = expandResourceFiles(selectedResources, selectedLocales)
+
+  const allStrings: Record<string, Record<string, TransifexStringsKeyValueJson>> = {}
+  const messages: string[] = []
+
+  const progress = new ProgressLogger(selectedResources.length + files.length)
+
+  const handleFile = async (resource: string, locale: string) => {
+    try {
+      const fileMessages = await pullAndValidateFile({
+        allStrings,
+        project,
+        resource,
+        locale,
+        mode,
+      })
+      for (const message of fileMessages) {
+        // `message` already contains locale and/or string info if appropriate
+        messages.push(`resource ${resource} / ${message}`)
+      }
+    } finally {
+      progress.increment()
+    }
+  }
+
+  // Ensure source locale is available for validation
+  await poolMap(selectedResources, CONCURRENCY_LIMIT, async resource => handleFile(resource, SOURCE_LOCALE))
+
+  // Non-source locales
+  await poolMap(files, CONCURRENCY_LIMIT, async ({ resource, locale }) => handleFile(resource, locale))
+
+  return {
+    allStrings,
+    messages,
+  }
+}

package/scripts/lib/validate.mts

@@ -1,4 +1,3 @@
-import assert from 'assert'
 import parse from 'format-message-parse'
 import {
   TransifexStringChrome,
@@ -84,24 +83,52 @@ export const validMessage = (message: TransifexEditorString, source: TransifexEd
 }
 
 /**
- * @param translation - the translations to validate and their corresponding source strings
- * @param translation.locale - the Transifex locale, for error reporting
- * @param translation.translations - the translations to validate
+ * Validate and filter translations.
+ * WARNING: Modifies the translations object in place by replacing invalid translations with source strings.
+ * @param locale - the Transifex locale, for error reporting
+ * @param translations - the translations to validate and filter
  * @param source - the source strings for the translations
+ * @returns a list of messages about errors encountered during validation. Every removed translation will have a
+ * message. Some messages may not correspond to removed translations (e.g., when the number of keys differ).
  */
-export const validateTranslations = (
-  { locale, translations }: { locale: string; translations: TransifexEditorStrings },
+export const filterInvalidTranslations = (
+  locale: string,
+  translations: TransifexEditorStrings,
   source: TransifexEditorStrings,
-) => {
-  const transKeys = Object.keys(translations)
+): string[] => {
+  const messages: string[] = []
+
   const sourceKeys = Object.keys(source)
-  assert.strictEqual(transKeys.length, sourceKeys.length, `locale ${locale} has a different number of message keys`)
-  transKeys.forEach(item => assert(sourceKeys.includes(item), `locale ${locale} has key ${item} not in the source`))
-  sourceKeys.forEach(item => assert(transKeys.includes(item), `locale ${locale} is missing key ${item}`))
-  sourceKeys.forEach(item =>
-    assert(
-      validMessage(translations[item], source[item]),
-      `locale ${locale} / item ${item}: message validation failed:\n  msg: ${getMessageText(translations[item])}\n  src: ${getMessageText(source[item])}`,
-    ),
-  )
+
+  const transKeys = Object.keys(translations).filter(item => {
+    if (!sourceKeys.includes(item)) {
+      messages.push(`locale ${locale} has key ${item} not in the source`)
+      delete translations[item]
+      return false
+    }
+    return true
+  })
+
+  sourceKeys.forEach(item => {
+    if (!transKeys.includes(item)) {
+      messages.push(`locale ${locale} is missing key ${item}`)
+    }
+  })
+
+  transKeys.forEach(item => {
+    if (!validMessage(translations[item], source[item])) {
+      messages.push(
+        [
+          `locale ${locale} / item ${item}: message validation failed:`,
+          `  msg: ${getMessageText(translations[item])}`,
+          `  src: ${getMessageText(source[item])}`,
+        ].join('\n'),
+      )
+
+      // fall back to source message
+      translations[item] = source[item]
+    }
+  })
+
+  return messages
 }

package/scripts/tx-pull-editor.mts

@@ -8,11 +8,7 @@
  */
 import fs from 'fs'
 import path from 'path'
-import locales, { localeMap } from '../src/supported-locales.mjs'
-import { poolMap } from './lib/concurrent.mts'
-import { TransifexStringsKeyValueJson } from './lib/transifex-formats.mts'
-import { txPull } from './lib/transifex.mts'
-import { TransifexEditorStrings, validateTranslations } from './lib/validate.mts'
+import { pullAndValidateProject } from './lib/pull-and-validate.mts'
 
 const args = process.argv.slice(2)
 
@@ -37,38 +33,20 @@ const PROJECT = args[0]
 const RESOURCE = args[1]
 const OUTPUT_DIR = path.resolve(args[2])
 const MODE = 'reviewed'
-const CONCURRENCY_LIMIT = 36
 
-const getLocaleData = async function (locale: string) {
-  const txLocale = localeMap[locale] || locale
-  const data = (await txPull(PROJECT, RESOURCE, txLocale, MODE)) as TransifexEditorStrings
-  return {
-    locale: locale,
-    translations: data,
-  }
-}
+const validationResults = await pullAndValidateProject({
+  project: PROJECT,
+  resources: [RESOURCE],
+  mode: MODE,
+})
 
-const pullTranslations = async function () {
-  const values = await poolMap(Object.keys(locales), CONCURRENCY_LIMIT, getLocaleData)
-  const source = values.find(elt => elt.locale === 'en')?.translations
-  if (!source) {
-    throw new Error('Could not find source strings')
+for (const resource of Object.values(validationResults.allStrings)) {
+  for (const [locale, strings] of Object.entries(resource)) {
+    const file = JSON.stringify(strings, null, 4)
+    fs.writeFileSync(`${OUTPUT_DIR}/${locale}.json`, file)
   }
-  values.forEach(translation => {
-    validateTranslations({ locale: translation.locale, translations: translation.translations }, source)
-    // if translation has message & description, we only want the message
-    const txs: TransifexStringsKeyValueJson = {}
-    for (const key of Object.keys(translation.translations)) {
-      const tx = translation.translations[key]
-      if (typeof tx === 'string') {
-        txs[key] = tx
-      } else {
-        txs[key] = tx.message
-      }
-    }
-    const file = JSON.stringify(txs, null, 4)
-    fs.writeFileSync(`${OUTPUT_DIR}/${translation.locale}.json`, file)
-  })
 }
 
-await pullTranslations()
+if (validationResults.messages.length > 0) {
+  console.error(validationResults.messages.join('\n\n'))
+}

package/scripts/tx-pull-www.mts

@@ -9,10 +9,7 @@
 import fs from 'fs/promises'
 import { mkdirp } from 'mkdirp'
 import path from 'path'
-import locales, { localeMap } from '../src/supported-locales.mjs'
-import { poolMap } from './lib/concurrent.mts'
-import { ProgressLogger } from './lib/progress-logger.mjs'
-import { txPull, txResources } from './lib/transifex.mts'
+import { pullAndValidateProject } from './lib/pull-and-validate.mts'
 
 const args = process.argv.slice(2)
 
@@ -37,68 +34,34 @@ if (!process.env.TX_TOKEN || args.length < 1) {
 const PROJECT = 'scratch-website'
 const OUTPUT_DIR = path.resolve(args[0])
 // const MODE = {mode: 'reviewed'}; // default is everything for www
-const CONCURRENCY_LIMIT = 36
 
-const lang = args.length === 2 ? args[1] : ''
+const lang = args.length === 2 ? args[1] : undefined
+const validationResults = await pullAndValidateProject({
+  project: PROJECT,
+  selectedLocales: lang,
+})
 
-const getLocaleData = async function (item: { locale: string; resource: string }) {
-  const locale = item.locale
-  const resource = item.resource
-  const txLocale = localeMap[locale] || locale
+for (const [resourceName, resource] of Object.entries(validationResults.allStrings)) {
+  for (const [locale, translations] of Object.entries(resource)) {
+    const txOutdir = `${OUTPUT_DIR}/${PROJECT}.${resourceName}`
+    const fileName = `${txOutdir}/${locale}.json`
 
-  const translations = await txPull(PROJECT, resource, txLocale)
-
-  const txOutdir = `${OUTPUT_DIR}/${PROJECT}.${resource}`
-  const fileName = `${txOutdir}/${locale}.json`
-
-  try {
-    mkdirp.sync(txOutdir)
-    await fs.writeFile(fileName, JSON.stringify(translations, null, 4))
-
-    return {
-      resource,
-      locale,
-      fileName,
-    }
-  } catch (e) {
-    ;(e as Error).cause = {
-      resource,
-      locale,
-      translations,
-      txOutdir,
-      fileName,
-    }
-    throw e
-  }
-}
-
-const expandResourceFiles = (resources: string[]) => {
-  const items = []
-  for (const resource of resources) {
-    if (lang) {
-      items.push({ resource: resource, locale: lang })
-    } else {
-      for (const locale of Object.keys(locales)) {
-        items.push({ resource: resource, locale: locale })
+    try {
+      mkdirp.sync(txOutdir)
+      await fs.writeFile(fileName, JSON.stringify(translations, null, 4))
+    } catch (e) {
+      ;(e as Error).cause = {
+        resourceName,
+        locale,
+        translations,
+        txOutdir,
+        fileName,
       }
+      throw e
     }
   }
-  return items
 }
 
-const pullTranslations = async function () {
-  const resources = await txResources(PROJECT)
-  const allFiles = expandResourceFiles(resources)
-
-  const progress = new ProgressLogger(allFiles.length)
-
-  await poolMap(allFiles, CONCURRENCY_LIMIT, async item => {
-    try {
-      await getLocaleData(item)
-    } finally {
-      progress.increment()
-    }
-  })
+if (validationResults.messages.length > 0) {
+  console.error(validationResults.messages.join('\n\n'))
 }
-
-await pullTranslations()

package/scripts/validate-translations.mts

@@ -7,7 +7,7 @@ import async from 'async'
 import fs from 'fs'
 import path from 'path'
 import locales from '../src/supported-locales.mjs'
-import { TransifexEditorStrings, validateTranslations } from './lib/validate.mts'
+import { filterInvalidTranslations, TransifexEditorStrings } from './lib/validate.mts'
 
 const args = process.argv.slice(2)
 const usage = `
@@ -31,11 +31,10 @@ const validate = (locale: string, callback: async.ErrorCallback) => {
     if (err) callback(err)
     // let this throw an error if invalid json
     const strings = JSON.parse(data) as TransifexEditorStrings
-    const translations = {
-      locale: locale,
-      translations: strings,
+    const messages = filterInvalidTranslations(locale, strings, source)
+    if (messages.length > 0) {
+      callback(new Error(`Locale ${locale} has validation errors:\n${messages.join('\n')}`))
     }
-    validateTranslations(translations, source)
   })
 }
 

package/scripts/validate-www.mts

@@ -9,7 +9,7 @@ import glob from 'glob'
 import path from 'path'
 import locales from '../src/supported-locales.mjs'
 import { TransifexStringsKeyValueJson, TransifexStrings } from './lib/transifex-formats.mts'
-import { validateTranslations } from './lib/validate.mts'
+import { filterInvalidTranslations } from './lib/validate.mts'
 
 const args = process.argv.slice(2)
 const usage = `
@@ -37,11 +37,10 @@ const validate = (localeData: LocaleData, callback: async.ErrorCallback) => {
     if (err) callback(err)
     // let this throw an error if invalid json
     const strings = JSON.parse(data) as TransifexStringsKeyValueJson
-    const translations = {
-      locale: localeData.locale,
-      translations: strings,
+    const messages = filterInvalidTranslations(localeData.locale, strings, localeData.sourceData)
+    if (messages.length > 0) {
+      callback(new Error(`Locale ${localeData.locale} has validation errors:\n${messages.join('\n')}`))
     }
-    validateTranslations(translations, localeData.sourceData)
   })
 }
 

package/www/scratch-website.about-l10njson/ab.json

@@ -5,37 +5,11 @@
     "about.foundationText": "Scratch Афонд",
     "about.introParents": "Аҭаацәа рзы аинформациа",
     "about.introEducators": "Арҵаҩцәа рзы аинформациа",
-    "about.whoUsesScratch": "Зхы иазырхәода Scrath?",
-    "about.whoUsesScratchDescription": "Scratch аԥҵара азхәыцын ахәыҷқәа 8 инаркны 16 шықәса зхыҵуа рзы, аха иахьа рхы иадырхәоит хәыҷи дыуи зегьы. Миллионла ауаа иаԥырҵоит Scratch – апроектқәа иеиуеиԥшым аҭагылазаашьақәеи аҭыԥқәеи рҿы – аҩны, ашколқәа, амузеиқәа, абиблиотекақәа рҿы уҳәа убас егь..",
-    "about.aroundTheWorld": "Адунеи зегь аҟны",
-    "about.aroundTheWorldDescription": "Scratch is used in more than {countryCount} different countries and territories and is available in more than {languageCount} languages. To change languages, click the menu at the bottom of the page. Or, in the Project Editor, click the globe at the top of the page. To add or improve a translation, see the {translationLink} page.",
-    "about.translationLinkText": "аиҭага",
-    "about.quotes": "Ацитатақәа",
-    "about.quotesDescription": " Scratch акоманда иаиуеит ирацәаны асалам шәҟқәа аҿари,  аҭаацәеи, арҵаҩцәеи рҟынтәи. Ишәҭахума еилышәкаарц ауаа ирыҩуа? Ашәҟқәеи, дара ирнуи аилкааразы шәхы иашәырхә азхьарԥш {quotesLink}.",
-    "about.quotesLinkText": "ацитатақәа",
-    "about.learnMore": "Scratch иазкны иҵегьы",
-    "about.learnMoreFaq": "Лассы-лассы изызҵаауа",
-    "about.learnMoreParents": "Аҭаацәа рзы аинформациа",
-    "about.learnMoreEducators": "Information for Educators",
-    "about.learnMoreAnnualReport": "Есышықәсатәи аҳасабырба",
-    "about.literacy": "Ишәҵала акод аиқәыршәашьа, еиқәшәыршәала акод, аҵара азы",
-    "about.literacyImageDescription": "An image of Mitch Resnick giving a TED talk titled \"Let's Teach Kids to Code.\" A play button is in the center of the image.",
-    "about.literacyDescription": "In this <a>TED talk</a>, Scratch founder Mitch Resnick describes why the ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.",
-    "about.schools": "Scratch ашколқәа рҿы",
-    "about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educator resources are available on the {scratchForEducatorsLink} page.",
-    "about.scratchForEducatorsLinkText": "Scratch For Educators",
-    "about.scratchedLinkText": "ScratchEd асаит",
-    "about.research": "Аҭҵаарақәа",
-    "about.researchDescription": "The {lifelongKindergartenGroupLink} and collaborators are {researchLink} how young people create, collaborate, and learn with Scratch. For an overview, see the article {codingAtACrossroadsLink} and the book {lifelongKindergartenBookLink}. To find out more about the use of Scratch, see the {statisticsLink} page and the Scratch {annualReportLink}.",
-    "about.researchLinkText": "researching",
-    "about.statisticsLinkText": "астатистика",
-    "about.lifelongKindergartenGroupLinkText": "Lifelong Kindergarten агәыԥ",
-    "about.codingAtACrossroadsLinkText": "Coding at a Crossroads",
-    "about.lifelongKindergartenBookLinkText": "Lifelong Kindergarten",
-    "about.annualReportLinkText": "Есышықәсатәи аҳасабырба",
-    "about.support": "Адгылареи ԥарала ацхыраареи",
-    "about.supportDescription": "Scratch is available for free, thanks to support from our {donorsLink}. This support helps us provide kids around the world with opportunities to imagine, create, and share. You can support Scratch by making a donation {donateLink}.",
-    "about.donorsLinkText": "адонорцәа",
-    "about.donateLinkText": "абра",
+    "about.introLearnMore": "Learn more at Scratch Foundation",
+    "about.support": "Support Scratch",
+    "about.supportDescription1": "Scratch is available for free, thanks to our {supportersLink}. This support helps us provide young people around the world with opportunities to imagine, create, and share.",
+    "about.supportDescription2": "Every dollar donated gives one child access to free, playful, and powerful creative learning through the Scratch community.",
+    "about.supportDescription3": "Join us in helping kids everywhere create what they imagine.",
+    "about.supportersLinkText": "supporters",
     "about.donateButton": "Ацхыраара аҟаҵара"
 }

package/www/scratch-website.about-l10njson/af.json

@@ -5,37 +5,11 @@
     "about.foundationText": "Scratch Stigting",
     "about.introParents": "Inligting vir ouers",
     "about.introEducators": "Inligting vir opvoeders",
-    "about.whoUsesScratch": "Wie gebruik Scratch?",
-    "about.whoUsesScratchDescription": "Scratch is spesifiek ontwerp vir ouderdomme 8 tot 16 maar word deur mense van alle ouderdomme gebruik. Miljoene mense skep Scratch-projekte in allerhande plekke, insluitend huise, skole, museums, biblioteke en gemeenskapsentra.",
-    "about.aroundTheWorld": "Regoor die wêreld",
-    "about.aroundTheWorldDescription": "Scratch word gebruik in meer as {countryCount}verskillende lande en streke en is beskikbaar in meer as {languageCount} tale. Klik die kieslys onderaan die bladsy, of klik die aardbol bo-aan die Projekredigeerder bladsy om die taal te verander. Sien die {translationLink} om 'n vertaling toe te voeg of te verbeter.",
-    "about.translationLinkText": "vertaling",
-    "about.quotes": "Aanhalings",
-    "about.quotesDescription": "The Scratch Team has received many emails from youth, parents, and educators expressing thanks for Scratch. Want to see what people are saying? You can read a collection of the {quotesLink} we've received.",
-    "about.quotesLinkText": "aanhalings",
-    "about.learnMore": "Meer inligting oor Scratch",
-    "about.learnMoreFaq": "Gereelde vrae",
-    "about.learnMoreParents": "Inligting vir ouers",
-    "about.learnMoreEducators": "Inligting vir Opvoeders",
-    "about.learnMoreAnnualReport": "Jaarverslag",
-    "about.literacy": "Leer om te Programmeer, Programmeer om te Leer",
-    "about.literacyImageDescription": "An image of Mitch Resnick giving a TED talk titled \"Let's Teach Kids to Code.\" A play button is in the center of the image.",
-    "about.literacyDescription": "In this <a>TED talk</a>, Scratch founder Mitch Resnick describes why the ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.",
-    "about.schools": "Scratch in skole",
-    "about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educator resources are available on the {scratchForEducatorsLink} page.",
-    "about.scratchForEducatorsLinkText": "Scratch vir Opvoeders",
-    "about.scratchedLinkText": "ScratchEd webwerf",
-    "about.research": "Navorsing",
-    "about.researchDescription": "The {lifelongKindergartenGroupLink} and collaborators are {researchLink} how young people create, collaborate, and learn with Scratch. For an overview, see the article {codingAtACrossroadsLink} and the book {lifelongKindergartenBookLink}. To find out more about the use of Scratch, see the {statisticsLink} page and the Scratch {annualReportLink}.",
-    "about.researchLinkText": "navorsing",
-    "about.statisticsLinkText": "Statistieke",
-    "about.lifelongKindergartenGroupLinkText": "Lewenslange Kleuterskoolgroep",
-    "about.codingAtACrossroadsLinkText": "Programmering by 'n Kruispad",
-    "about.lifelongKindergartenBookLinkText": "Lewenslange Kleuterskool",
-    "about.annualReportLinkText": "Jaarverslag",
-    "about.support": "Ondersteuning en Befondsing",
-    "about.supportDescription": "Scratch is gratis beskikbaar danksy steun van ons {donorsLink}. Hierdie ondersteuning help ons om aan kinders regoor die wêreld die geleentheid te bied om te verbeel, skep en deel. U kan Sckratch ondersteun deur 'n skenking te maak {donateLink}.",
-    "about.donorsLinkText": "skenkers",
-    "about.donateLinkText": "hier",
+    "about.introLearnMore": "Learn more at Scratch Foundation",
+    "about.support": "Support Scratch",
+    "about.supportDescription1": "Scratch is available for free, thanks to our {supportersLink}. This support helps us provide young people around the world with opportunities to imagine, create, and share.",
+    "about.supportDescription2": "Every dollar donated gives one child access to free, playful, and powerful creative learning through the Scratch community.",
+    "about.supportDescription3": "Join us in helping kids everywhere create what they imagine.",
+    "about.supportersLinkText": "supporters",
     "about.donateButton": "Skenk"
 }

package/www/scratch-website.about-l10njson/am.json

@@ -5,37 +5,11 @@
     "about.foundationText": "Scratch Foundation",
     "about.introParents": "መረጃ ለወላጆች ",
     "about.introEducators": "መረጃ ለአስተማሪዎች",
-    "about.whoUsesScratch": "ማን እስክራችን  ይጠቀማል?",
-    "about.whoUsesScratchDescription": "ስክራች እድሚያቸው ከ 8 - 16 ለሆኑ ልጆች የተሰራ ቢሆንም፤ በማንኛውም እድሜ ላሉ የሚሆን ነው። ብዙ ሰዎች በቤታቸው ፥ በት/ቤት፥ በመፅሃፍት ቤት፤ እና ቤሌሎች ቦታዎችህ ስክራችህ እየተጠቀሙ ነው።",
-    "about.aroundTheWorld": "በአለም ዙሪያ",
-    "about.aroundTheWorldDescription": "Scratch is used in more than {countryCount} different countries and territories and is available in more than {languageCount} languages. To change languages, click the menu at the bottom of the page. Or, in the Project Editor, click the globe at the top of the page. To add or improve a translation, see the {translationLink} page.",
-    "about.translationLinkText": "ትርጉም",
-    "about.quotes": "ጥቅሶች",
-    "about.quotesDescription": "የስክራች ቡድን ብዙ የምስጋና ኢሜሎችን ከታዳጊዎች፣ ከወላጆችና ከአስተማሪዎች ተቀብሏል። የሰዎቹን መልስ ማየት ትፈልጋላችሁ? የተቀበልነውን ስብስብ እዚህ፡{quotesLink} ማንበብ ትችላላችሁ።",
-    "about.quotesLinkText": "ቃሎች",
-    "about.learnMore": "ሰለእስክራች የበለጠ ይወቁ",
-    "about.learnMoreFaq": "ተደጋግሞ የሚነሱ ጥያቄዎች",
-    "about.learnMoreParents": "መረጃ ለወላጆች ",
-    "about.learnMoreEducators": "Information for Educators",
-    "about.learnMoreAnnualReport": "Annual Report",
-    "about.literacy": "ኮድ መፃፍ ይማሩ፤ ለመማር ኮድ ያድርጉ።",
-    "about.literacyImageDescription": "An image of Mitch Resnick giving a TED talk titled \"Let's Teach Kids to Code.\" A play button is in the center of the image.",
-    "about.literacyDescription": "In this <a>TED talk</a>, Scratch founder Mitch Resnick describes why the ability to code computer programs is an important part of literacy in today’s society. When people learn to code in Scratch, they learn important strategies for solving problems, designing projects, and communicating ideas.",
-    "about.schools": "ስክራች በት/ቤቶች ውስጥ",
-    "about.schoolsDescription": "Students are learning with Scratch at all levels (from elementary school to college) and across disciplines (such as math, computer science, language arts, social studies). Educator resources are available on the {scratchForEducatorsLink} page.",
-    "about.scratchForEducatorsLinkText": "Scratch For Educators",
-    "about.scratchedLinkText": "ScratchEd  ድረ-ገፅ",
-    "about.research": "ምርምር",
-    "about.researchDescription": "The {lifelongKindergartenGroupLink} and collaborators are {researchLink} how young people create, collaborate, and learn with Scratch. For an overview, see the article {codingAtACrossroadsLink} and the book {lifelongKindergartenBookLink}. To find out more about the use of Scratch, see the {statisticsLink} page and the Scratch {annualReportLink}.",
-    "about.researchLinkText": "researching",
-    "about.statisticsLinkText": "ስታቲስቲክስ",
-    "about.lifelongKindergartenGroupLinkText": "Lifelong Kindergarten group",
-    "about.codingAtACrossroadsLinkText": "Coding at a Crossroads",
-    "about.lifelongKindergartenBookLinkText": "ላይፍሎንግ ኪንደርጋርተን",
-    "about.annualReportLinkText": "Annual Report",
-    "about.support": "ድጋፍ እና የገንዘብ እርዳታ ",
-    "about.supportDescription": "Scratch is available for free, thanks to support from our {donorsLink}. This support helps us provide kids around the world with opportunities to imagine, create, and share. You can support Scratch by making a donation {donateLink}.",
-    "about.donorsLinkText": "donors",
-    "about.donateLinkText": "እዚህ",
+    "about.introLearnMore": "Learn more at Scratch Foundation",
+    "about.support": "Support Scratch",
+    "about.supportDescription1": "Scratch is available for free, thanks to our {supportersLink}. This support helps us provide young people around the world with opportunities to imagine, create, and share.",
+    "about.supportDescription2": "Every dollar donated gives one child access to free, playful, and powerful creative learning through the Scratch community.",
+    "about.supportDescription3": "Join us in helping kids everywhere create what they imagine.",
+    "about.supportersLinkText": "supporters",
     "about.donateButton": "ለScratch ለመለገስ"
 }

package/www/scratch-website.about-l10njson/an.json

@@ -5,37 +5,11 @@
     "about.foundationText": "Fundación Scratch",
     "about.introParents": "Información pa pais",
     "about.introEducators": "Información pa educadores",
-    "about.whoUsesScratch": "Quí usan Scratch?",
-    "about.whoUsesScratchDescription": "Scratch ye diseñado especialment pa edatz entre os 8 y 16 anyos, pero lo usan personas de todas as edatz. I hai millons de personas creyando prochectos en Scratch en una amplia variedat d'entornos, incluindo fogars, escuelas, museos, bibliotecas y centros comunitarios.",
-    "about.aroundTheWorld": "Arredol d'o mundo",
-    "about.aroundTheWorldDescription": "Scratch s'utiliza en mas de {countryCount} países y territorios diferents y ye disponible en mas de {languageCount} idiomas. Pa cambiar d'idioma, preta en o menú d'a parte inferior d'a pachina. U, en o Editor de Prochectos, preta en o globo terraquio d'a parte superior d'a pachina. Pa anyadir u amillorar una traducción, consulte la pachina {translationLink}.",
-    "about.translationLinkText": "traducción",
-    "about.quotes": "Citas",
-    "about.quotesDescription": "L'Equipo de Scratch ha recibiu muitos correus de parte de chovens, pais y docents dando-nos as gracias por creyar Scratch. Quiers veyer o que diz a chent? Puetz leyer una colección d'as {quotesLink} que hemos recibiu.",
-    "about.quotesLinkText": "citas",
-    "about.learnMore": "Aprende mas sobre Scratch",
-    "about.learnMoreFaq": "Preguntas Freqüents (FAQ)",
-    "about.learnMoreParents": "Información pa pais",
-    "about.learnMoreEducators": "Información pa educadors",
-    "about.learnMoreAnnualReport": "Informe anyal",
-    "about.literacy": "Aprende a programar, programar pa aprender",
-    "about.literacyImageDescription": "Una imachen de Mitch Resnick dando una charra TED titulau \"Amostremos a los ninos a codificar\". En o centro d'a imachen amaneixe un botón de reproducción.",
-    "about.literacyDescription": "En esta <a>charra TED</a>, lo fundador de Scratch, Mitch Resnick, describe per qué la capacidat de codificar programas informaticos ye una parte important de l'alfabetización en a sociedat actual. Cuan la chent aprende a programar con Scratch, aprende estratechias importants pa resolver problemas, disenyar prochectos y comunicar ideyas.",
-    "about.schools": "Scratch en as escuelas",
-    "about.schoolsDescription": "Os estudiants aprenden con Scratch en totz os libels (dende a escuela primaria dica a universidat) y en todas as disciplinas (como que matematicas, informatica, luenga y literatura, estudios socials). Os recursos pa educadors son disponibles en a pachina {scratchForEducatorsLink}.",
-    "about.scratchForEducatorsLinkText": "Scratch pa educadors",
-    "about.scratchedLinkText": "pachina web de ScratchEd",
-    "about.research": "Investigación",
-    "about.researchDescription": "Lo {lifelongKindergartenGroupLink} y los colaboradors son {researchLink} cómo los chovens creyan, colaboran y aprenden con Scratch. Pa obtener una visión cheneral, consulte l'articlo {codingAtACrossroadsLink} y lo libro {lifelongKindergartenBookLink}. Pa saber mas sobre l'uso de Scratch, consulte la pachina {statisticsLink} y lo {annualReportLink} de Scratch.",
-    "about.researchLinkText": "investigando",
-    "about.statisticsLinkText": "estatisticas",
-    "about.lifelongKindergartenGroupLinkText": " Grupo de Lifelong Kindergarten \"chardín de infancia Lifelong\"",
-    "about.codingAtACrossroadsLinkText": "Codificación en Crossroads \"cruzillata\"",
-    "about.lifelongKindergartenBookLinkText": "Chardín de infancia Lifelong",
-    "about.annualReportLinkText": "Informe anyal",
-    "about.support": "Emparo y financiamiento",
-    "about.supportDescription": "Scratch ye disponible de forma gratuita, gracias a l'emparo d'o nuestro {donorsLink}. Este emparo nos aduya a proporcionar a los ninos arredol d'o mundo oportunidatz pa imachinar, creyar y compartir. Puetz emparar a Scratch fendo una donación {donateLink}.",
-    "about.donorsLinkText": "donants",
-    "about.donateLinkText": "aquí",
+    "about.introLearnMore": "Learn more at Scratch Foundation",
+    "about.support": "Support Scratch",
+    "about.supportDescription1": "Scratch is available for free, thanks to our {supportersLink}. This support helps us provide young people around the world with opportunities to imagine, create, and share.",
+    "about.supportDescription2": "Every dollar donated gives one child access to free, playful, and powerful creative learning through the Scratch community.",
+    "about.supportDescription3": "Join us in helping kids everywhere create what they imagine.",
+    "about.supportersLinkText": "supporters",
     "about.donateButton": "Donar"
 }