Create a new pull request by comparing changes across two branches

client/i18n/locales/english/intro.json

@@ -1880,7 +1880,13 @@
       "yskn": { "title": "134", "intro": [] },
       "tpni": { "title": "135", "intro": [] },
       "hoec": { "title": "136", "intro": [] },
-      "cygu": { "title": "137", "intro": [] },
+      "workshop-teacher-chatbot": {
+        "title": "Build a Teacher Chatbot",
+        "intro": [
+          "In this workshop, you will continue to learn more about JavaScript strings by building a chatbot.",
+          "You will learn how to work with template literals, and the <code>indexOf</code> method."
+        ]
+      },
       "axgb": { "title": "138", "intro": [] },
       "rwac": { "title": "139", "intro": [] },
       "uzjg": { "title": "140", "intro": [] },
@@ -1921,7 +1927,10 @@
       "ccnu": { "title": "175", "intro": [] },
       "skiq": { "title": "176", "intro": [] },
       "epfc": { "title": "177", "intro": [] },
-      "gsfr": { "title": "178", "intro": [] },
+      "lab-gradebook-app": {
+        "title": "Build a Gradebook App",
+        "intro": ["For this lab, you will create a gradebook app."]
+      },
       "fbbn": { "title": "179", "intro": [] },
       "lnmg": { "title": "180", "intro": [] },
       "wead": { "title": "181", "intro": [] },
@@ -1950,9 +1959,9 @@
       "ksfc": { "title": "204", "intro": [] },
       "xeqa": { "title": "205", "intro": [] },
       "lab-random-background-color-changer": {
-        "title": "Build a Random Background Color Changer",
+        "title": "Debug a Random Background Color Changer",
         "intro": [
-          "For this lab, you will create a random background color changer."
+          "For this lab, you will debug a random background color changer and fix the errors to make it work properly."
         ]
       },
       "dqth": { "title": "207", "intro": [] },

client/i18n/locales/portuguese/intro.json

@@ -1779,10 +1779,10 @@
         "intro": []
       },
       "workshop-hotel-feedback-form": {
-        "title": "Build a Hotel Feedback Form",
+        "title": "Crie um formulário de feedback de hotéis",
         "intro": [
-          "In this workshop, you will learn how to work with forms by building a Hotel Feedback Form.",
-          "You will learn how to work with labels, inputs, fieldsets, legends, textareas and buttons."
+          "Neste workshop, você aprenderá a trabalhar com formulários criando um formulário de feedback de hotéis.",
+          "Você aprenderá a trabalhar com os elementos label, input, fieldset, legend, textarea e button."
         ]
       },
       "lab-survey-form": {

client/i18n/locales/portuguese/translations.json

@@ -1,7 +1,7 @@
 {
   "buttons": {
     "logged-in-cta-btn": "Comece (é grátis)",
-    "get-started": "Get Started",
+    "get-started": "Primeiros passos",
     "logged-out-cta-btn": "Inicie a sessão para salvar seu progresso (é grátis)",
     "view-curriculum": "Visualizar o currículo",
     "first-lesson": "Ir para a primeira aula",
@@ -107,15 +107,15 @@
   },
   "landing": {
     "big-heading-1": "Aprenda a programar — de graça.",
-    "big-heading-1-b": "Learn to code.",
+    "big-heading-1-b": "Aprenda a programar.",
     "big-heading-2": "Crie projetos.",
     "big-heading-3": "Obtenha certificações.",
-    "big-heading-4": "All for free.",
+    "big-heading-4": "De graça.",
     "h2-heading": "Desde 2014, mais de 40.000 pessoas que concluíram o freeCodeCamp.org obtiveram empregos em empresas de tecnologia incluindo:",
-    "h2-heading-b": "More than 100,000 freeCodeCamp.org graduates have gotten jobs at tech companies including:",
+    "h2-heading-b": "Mais de 100 mil pessoas já concluíram o freeCodeCamp.org e obtiveram empregos em empresas de tecnologia, incluindo:",
     "hero-img-description": "Estudantes do freeCodeCamp em um grupo de estudos local na Coreia do Sul.",
     "hero-img-alt": "Um grupo de pessoas, incluindo um homem branco, uma mulher negra e uma mulher asiática, reunidos ao redor de um laptop.",
-    "hero-img-uis": "A group of screenshots showing the freeCodeCamp editor interface on both a mobile and desktop device and a certification.",
+    "hero-img-uis": "Um grupo de capturas de tela mostrando a interface de editor do freeCodeCamp em um dispositivo móvel e em um desktop, além de uma certificação.",
     "as-seen-in": "Conforme visto em:",
     "testimonials": {
       "heading": "Veja o que os nossos ex-alunos dizem sobre o freeCodeCamp:",
@@ -281,9 +281,9 @@
       "reset-p3": "Não conseguiremos recuperar nada disso depois, mesmo que você mude de ideia.",
       "nevermind-2": "Deixa para lá, não quero apagar todo o meu progresso",
       "reset-confirm": "Redefinir tudo. Eu quero começar do início",
-      "verify-text": "To verify, type \"{{ verifyText }}\" below:",
-      "verify-reset-text": "I agree that all progress will be lost",
-      "verify-delete-text": "I agree to delete my account"
+      "verify-text": "Para verificar, digite \"{{ verifyText }}\" abaixo:",
+      "verify-reset-text": "Eu concordo que todo o progresso será perdido",
+      "verify-delete-text": "Eu concordo em excluir minha conta"
     },
     "email": {
       "missing": "Você não tem um e-mail associado a esta conta.",

client/src/pages/learn/front-end-development/lab-gradebook-app/index.md

@@ -0,0 +1,9 @@
+---
+title: Introduction to the Build a Gradebook App
+block: lab-gradebook-app
+superBlock: front-end-development
+---
+
+## Introduction to the Build a Gradebook App
+
+For this lab, you will create a gradebook app.

client/src/pages/learn/front-end-development/lab-random-background-color-changer/index.md

@@ -1,9 +1,9 @@
 ---
-title: Introduction to the Build a Random Background Color Changer
+title: Introduction to the Debug a Random Background Color Changer
 block: lab-random-background-color-changer
 superBlock: front-end-development
 ---
 
-## Introduction to the Build a Random Background Color Changer
+## Introduction to the Debug a Random Background Color Changer
 
-For this lab, you will create a random background color changer.
+For this lab, you will debug a random background color changer and fix the errors to make it work properly.

client/src/pages/learn/front-end-development/workshop-teacher-chatbot/index.md

@@ -0,0 +1,9 @@
+---
+title: Introduction to the Build a Teacher Chatbot
+block: workshop-teacher-chatbot
+superBlock: front-end-development
+---
+
+## Introduction to the Build a Teacher Chatbot
+
+This is a test for the new project-based curriculum.

curriculum/challenges/_meta/lab-gradebook-app/meta.json

@@ -0,0 +1,11 @@
+{
+  "name": "Build a Gradebook App",
+  "blockType": "lab",
+  "isUpcomingChange": true,
+  "usesMultifileEditor": true,
+  "dashedName": "lab-gradebook-app",
+  "order": 178,
+  "superBlock": "front-end-development",
+  "challengeOrder": [{ "id": "66bb6a9c2dd58b73cd759034", "title": "Build a Gradebook App" }],
+  "helpCategory": "JavaScript"
+}

curriculum/challenges/_meta/lab-random-background-color-changer/meta.json

@@ -1,11 +1,11 @@
 {
-  "name": "Build a Random Background Color Changer",
+  "name": "Debug a Random Background Color Changer",
   "blockType": "lab",
   "isUpcomingChange": true,
   "usesMultifileEditor": true,
   "dashedName": "lab-random-background-color-changer",
   "order": 206,
   "superBlock": "front-end-development",
-  "challengeOrder": [{ "id": "66b62d0ad68488dd76228d6c", "title": "Build a Random Background Color Changer" }],
+  "challengeOrder": [{ "id": "66b62d0ad68488dd76228d6c", "title": "Debug a Random Background Color Changer" }],
   "helpCategory": "JavaScript"
 }

curriculum/challenges/_meta/workshop-teacher-chatbot/meta.json

@@ -0,0 +1,85 @@
+{
+  "name": "Build a Teacher Chatbot",
+  "blockType": "workshop",
+  "isUpcomingChange": true,
+  "usesMultifileEditor": true,
+  "hasEditableBoundaries": true,
+  "dashedName": "workshop-teacher-chatbot",
+  "order": 137,
+  "superBlock": "front-end-development",
+  "challengeOrder": [
+    {
+      "id": "66b102ee0bdbad34a9f85ba0",
+      "title": "Step 1"
+    },
+    {
+      "id": "66b5928b86e907fdfbf34e56",
+      "title": "Step 2"
+    },
+    {
+      "id": "66b59829dba144ff1351220f",
+      "title": "Step 3"
+    },
+    {
+      "id": "66b59b12a745e10011158f7b",
+      "title": "Step 4"
+    },
+    {
+      "id": "66b59be6ab830800c4df9146",
+      "title": "Step 5"
+    },
+    {
+      "id": "66b6d482bbb9e12f2e5ee1ae",
+      "title": "Step 6"
+    },
+    {
+      "id": "66b6e39031393e30f2c48d0f",
+      "title": "Step 7"
+    },
+    {
+      "id": "66b6e62423e8a031d6c1f03d",
+      "title": "Step 8"
+    },
+    {
+      "id": "66b6e80d6c3f0b329c360283",
+      "title": "Step 9"
+    },
+    {
+      "id": "66b6efddeca35833cd6f0b03",
+      "title": "Step 10"
+    },
+    {
+      "id": "66b6f586767a1534f3097353",
+      "title": "Step 11"
+    },
+    {
+      "id": "66b6f80fca500635d1e8af8d",
+      "title": "Step 12"
+    },
+    {
+      "id": "66b6fdb76441c738719039fa",
+      "title": "Step 13"
+    },
+    {
+      "id": "66b6ffb42b88e33943788abf",
+      "title": "Step 14"
+    },
+    {
+      "id": "66b7049b7709ea3a9547c79d",
+      "title": "Step 15"
+    },
+    {
+      "id": "66b70b8a611cbf3bcc5c6c5f",
+      "title": "Step 16"
+    },
+    {
+      "id": "66b7137348cfb53fd3ec6c73",
+      "title": "Step 17"
+    },
+    {
+      "id": "66b7142e588c4a407a51cdb6",
+      "title": "Step 18"
+    }
+  ],
+  "helpCategory": "JavaScript"
+}

curriculum/challenges/english/21-a2-english-for-developers/learn-conversation-starters-in-the-break-room/657b23ad0df43588a6eadfa4.md

@@ -35,7 +35,7 @@ The first sentence is correct, but the second one does not ask about interest. I
 
 ### --feedback--
 
-The first sentence is asking for a favorite thing, not interest in an activity. The second sentence is a statement, not a question.
+The first sentence is correct. The second sentence is a statement, not a question.
 
 ---