Normal sync in

Done before syncing in with changes, to capture more-accurate diffs

dashboard/config/locales/authored_hints.en.yml

@@ -10760,6 +10760,10 @@ en:
       courseE_farmer_concept4_authored_hint:
         4-5_Artist_Patterns_3_a: Be careful to pull out the full block of "code from the toolbar each time you try a new one.
         4-5_Artist_Patterns_3_b: If your code becomes too confusing, you can always click "Start Over" and try again!
+      courseE_farmer_elseif_test_authored_hint:
+        grade3_robotFarmer_ConditionalsIntro_8_a: The `while path ahead` block lets you keep going, even if you don't know how many squares are in a path.
+        grade3_robotFarmer_ConditionalsIntro_8_b: What should you do once you've reached the end of a path?
+        grade3_robotFarmer_ConditionalsIntro_8_c: Use a `repeat` loop to run your code multiple times for each straight path.
       courseE_farmer_functions1_authored_hint:
         courseE_farmer_functions1_a: The toolbox is organized a little differently this time! Click on the different categories to see which blocks you have.
         courseE_farmer_functions1_b: You only need to pick one pumpkin, but could you use a loop to get to it?

dashboard/config/locales/instructions.en.yml

@@ -3535,6 +3535,7 @@ en:
       courseB_maze_seq1_2018_instruction: "Play with these blocks to see what they make Scrat do! \n\nGet Scrat to the acorn to complete the level."
       courseB_maze_seq2_instruction: '*"A bug! Fix the code to get me to the pig."*'
       courseB_maze_seq2_2018_instruction: A bug! Fix the code to get Scrat to the acorn!
+      courseB_maze_seq3_instruction: '"Fix the code to get me to the pig!"'
       courseB_maze_seq4_instruction: Add 2 blocks to get the bird to the pig.
       courseB_maze_seq4_2018_instruction: Use **2** movement blocks to get the Scrat to the acorn.
       courseB_maze_seq5_instruction: Now try this puzzle from the start!
@@ -4421,6 +4422,7 @@ en:
       courseE_farmer_concept3_instruction: Fill in the hole at the end of each of these paths.
       courseE_farmer_concept3_2018_instruction: Fill in the hole at the end of each of these paths.
       courseE_farmer_concept4_instruction: Now let's go one level deeper! We've nested that whole block of code into another loop, but you need to get the artist back in place to draw the next line. Which of these code blocks can you place at the end of the outermost loop to draw the whole grid?
+      courseE_farmer_elseif_test_instruction: Fill in the hole at the end of each of these paths.
       courseE_farmer_functions1_instruction: Help the harvester get to the pumpkin and pick it.
       courseE_farmer_functions10_instruction: 'No one knows what these sprouts will become.  Use `if` statements to write the code to check and harvest each one.   '
       courseE_farmer_functions10a1_2018_instruction: Use everything that you've learned so far to solve this puzzle!

i18n/locales/source/blockly-mooc/common.json

@@ -49,7 +49,6 @@
   "answerOptionF": "F",
   "answerOptionG": "G",
   "answersVisible": "Answers visible (read-only)",
-  "archiveSection": "Archive Section",
   "applabMarketingButton": "Learn more",
   "applabMarketingDesc": "See sample projects, watch demos, and learn more about what you can do with App Lab.",
   "applabMarketingTitle": "Learn about App Lab",
@@ -59,6 +58,7 @@
   "applabTutorialButton": "Start",
   "applabTutorialDesc": "Ready to try JavaScript? Design an app, code in JavaScript with either blocks or text, then share your app in seconds. For Ages 13+.",
   "applabTutorialTitle": "App Lab Hour of Code",
+  "archiveSection": "Archive Section",
   "assessmentSteps": "Steps to give assessment for",
   "assessmentSettings": "Assessment Settings",
   "assign": "Assign",
@@ -328,6 +328,38 @@
   "defaultProjectNameBasketball": "Basketball Project",
   "defaultProjectName": "My Project",
   "delete": "Delete",
+  "deleteAccount": "Delete Account",
+  "deleteAccount_studentWarning": "Deleting your account will permanently erase all personal information, coursework, and projects connected to this account.",
+  "deleteAccount_teacherWarning1": "Deleting your account will permanently erase all personal information, coursework, and projects connected to this account after 28 days. It will also ",
+  "deleteAccount_teacherWarning2": "delete your sections and your students’ accounts ",
+  "deleteAccount_teacherWarning3": "that don’t have a personal login or aren’t in another teacher’s section. Please make sure you have the authority to delete these students’ education records before deleting your own account. ",
+  "deleteAccount_teacherWarning4": "Give these students a chance to keep using their Code.org accounts by ",
+  "deleteAccount_teacherWarning5": "sending home instructions for creating personal logins. ",
+  "deleteAccount_teacherWarning6": "Give them at least a few days to follow these instructions BEFORE you delete your account.",
+  "deleteAccountDialog_header": "Are you sure you want to delete your account?",
+  "deleteAccountDialog_body1": "WARNING: ",
+  "deleteAccountDialog_body2": "Deleting your account will ",
+  "deleteAccountDialog_body3": "permanently erase ",
+  "deleteAccountDialog_body4": "all your personal information, coursework, and projects linked to this account after 28 days. ",
+  "deleteAccountDialog_body5": "It will also ",
+  "deleteAccountDialog_body6": "permanently delete your students’ accounts ",
+  "deleteAccountDialog_body7": "accounts unless they created a personal login.",
+  "deleteAccountDialog_checkboxPreface": "I understand that by deleting my account, ",
+  "deleteAccountDialog_checkboxTitle": "Please verify the following statements before you can delete your account:",
+  "deleteAccountDialog_checkbox1_1": "I have the authority to delete the education ",
+  "deleteAccountDialog_checkbox1_2": "records of the students in my sections (or release it to them, if they have a personal login).",
+  "deleteAccountDialog_checkbox2_1": "I am aware of the ",
+  "deleteAccountDialog_checkbox2_2": "message to send to parents ",
+  "deleteAccountDialog_checkbox2_3": "to warn them that their children’s coding projects will be deleted unless they act to preserve it by creating a personal login for their children.",
+  "deleteAccountDialog_checkbox3": "my students’ accounts may also be permanently deleted.",
+  "deleteAccountDialog_checkbox4": "my students may not be able to access their accounts anymore.",
+  "deleteAccountDialog_checkbox5": "the projects and creations of my students may also be deleted.",
+  "deleteAccountDialog_studentButton": "Delete my Account",
+  "deleteAccountDialog_teacherButton": "Delete my and my students' accounts",
+  "deleteAccountDialog_currentPassword": "Current password:",
+  "deleteAccountDialog_verification": "To verify, type {verificationString} below:",
+  "deleteAccountDialog_verificationString": "DELETE MY ACCOUNT",
+  "deleteAccountDialog_emailUs": "If you delete your account and change your mind, you can email us at support@code.org within 28 days to recover your account.",
   "deleteConfirm": "Delete?",
   "deleteProject": "Delete Project",
   "deleteSection": "Delete Section",
@@ -526,13 +558,19 @@
   "extrasNoBonusLevels": "There are no bonus levels for this lesson.",
   "extraTopBlocks": "You have unattached blocks.",
   "extraTopBlocksWhenRun": "You have unattached blocks. Did you mean to attach these to the \"when run\" block?",
+  "fallbackVideoClosedCaptioningLink": "Closed Captioning and Translations",
+  "fallbackVideoClosedCaptioningDialogHeading": "Closed captioning and translations available on YouTube",
+  "fallbackVideoClosedCaptioningDialogBody": "Please ask your IT department to allow access to https://www.youtube-nocookie.com/*, *.googlevideo.com/*, and *.ytimg.com/* in order to get closed captioning and translations.  Note that this version of YouTube will not collect any data from you other than what is required to play the video.",
+  "fallbackVideoClosedCaptioningDialogBodyLink": "See IT requirements",
+  "fallbackVideoClosedCaptioningDialogClose": "Close",
   "featureAgain": "Feature again",
   "featured": "Featured",
   "featureUnpublishedWarning": "This project is currently unpublished. It can still be marked as featured, but it will not show in the gallery until the owner publishes it.",
   "feedback": "Feedback",
   "feedbackFrom": "Feedback from {teacher}",
   "feedbackPlaceholder": "Please enter feedback for your student here. This will become visible to the student when you click 'Save and share'.",
   "feedbackSaveError": "There's been an error saving your feedback. Please try to save again.",
+  "feedbackLoadError": "There's been an error establishing a connection to our servers. Please refresh the page and try again.",
   "fewerNumberOfBlocks": "Fewer than {numBlocks, plural, one {1 block} other {# blocks}} used!",
   "filterByStudent": "Filter by student:",
   "filterByStage": "Filter by stage:",
@@ -577,6 +615,7 @@
   "hiddenSections": "Hidden Sections",
   "hiddenScriptTooltip": "Please select a section before trying to toggle whether or not the unit is visible to your students.",
   "hide": "Hide",
+  "hideArchivedSections": "Hide archived sections",
   "hideFullList": "Hide full list",
   "hideGeneratedCode": "Hide Code",
   "hideHiddenSections": "Hide hidden sections",
@@ -606,6 +645,7 @@
   "homepageUiTipsAfterDialogConfirm": "Learn more",
   "iconSearchPlaceholder": "Search for an icon...",
   "iDontKnow": "I don't know",
+  "ifCode": "if",
   "ignore": "Ignore",
   "importFromGoogleClassroom": "Import section from Google Classroom",
   "importFromClever": "Import section from Clever",
@@ -708,7 +748,7 @@
   "manageAssets": "Manage Assets",
   "manageLinkedAccounts": "Manage Linked Accounts",
   "manageLinkedAccounts_actions": "Actions",
-  "manageLinkedAccounts_cannotDisconnectTooltip": "To make sure you can still sign in to your account, please add a password or another linked account first.",
+  "manageLinkedAccounts_noLoginTooltip": "To make sure you can still sign in to your account, please add a password or another linked account first.",
   "manageLinkedAccounts_clever": "Clever Account",
   "manageLinkedAccounts_connect": "Connect",
   "manageLinkedAccounts_disconnect": "Disconnect",
@@ -718,6 +758,7 @@
   "manageLinkedAccounts_loginType": "Login Type",
   "manageLinkedAccounts_microsoft": "Microsoft Account",
   "manageLinkedAccounts_notConnected": "Not Connected",
+  "manageLinkedAccounts_rosteredSectionTooltip": "You cannot disconnect from this linked account because it is tied to one of your sections.",
   "manageStudents": "Manage Students",
   "manageStudentsNotificationFailure": "Something went wrong.",
   "manageStudentsNotificationCannotAdd": "You could not add {numStudents, plural, one {1 student} other {# students}} to your section. Please try again or refresh the page.",
@@ -755,6 +796,7 @@
   "nextStage": "Congratulations! You completed {stageName}.",
   "nextStageTrophies": "Congratulations! You completed {stageName} and won {numTrophies, plural, one {a trophy} other {# trophies}}.",
   "no": "No",
+  "noAssessments": "It looks like there are no multi-question assessments or surveys in this course. Instead, you can measure the students’ progress using the 'Progress' tab. If you are interested in giving your students additional assessments, you can find recommended questions and areas in the lesson plans.",
   "noClassroomsFound": "No classrooms found.",
   "noIconsFound": "No icons found",
   "noMenuItemsAvailable": "No menu items available.",
@@ -792,6 +834,13 @@
   "percentCorrect": "% correct",
   "perfect": "perfect",
   "perfectDescription": "PERFECT!",
+  "personalLoginDialog_body1": "Deleting your account will also delete your students’ accounts ",
+  "personalLoginDialog_body2": "unless they created a personal login for their accounts.",
+  "personalLoginDialog_body3": "Please give your students a chance to keep using their Code.org accounts by ",
+  "personalLoginDialog_body4": "sending these instructions home with them ",
+  "personalLoginDialog_body5": "on how they can create a personal login. Give them at least a few days to follow these instructions BEFORE you delete your account.",
+  "personalLoginDialog_body6": "If you have already done this, click “Next” to continue with account deletion.",
+  "personalLoginDialog_button": "Next",
   "play": "play",
   "playzoneArtistDescription": "Draw cool pictures and designs with the Artist!",
   "playzoneArtistTitle": "New Drawing",
@@ -939,6 +988,7 @@
   "puzzleRatingQuestion": "Did you like this puzzle?",
   "puzzleTitle": "Puzzle {puzzle_number} of {stage_total}",
   "question": "Question",
+  "questionDetails": "Question details",
   "questionText": "Question text",
   "quickActions": "Quick actions",
   "rateButtonsLabel": "Rate:",
@@ -951,10 +1001,17 @@
   "removeFromClassGallery": "Remove from Class Gallery",
   "removeFromPublicGallery": "Remove from Public Gallery",
   "removeStudent": "Remove student",
+  "removeStudentAndRecordsHeader": "Remove {studentName} and release their education records?",
+  "removeStudentBody1": "Make sure you have authority from the school to release this student’s education records",
+  "removeStudentBody2": "before removing them from your section. If the student is not in a teacher’s section, they will be in full control of their data and have the ability to delete their account, including their course progress and projects.",
+  "removeStudentBody3": "This student will no longer be able to sign in to their account once you remove them. Please give your student a chance to keep using their Code.org account by allowing them to create a personal login.",
+  "removeStudentBody4": "Give them at least a few days to follow these instructions before you remove them.",
   "removeStudentConfirm1": "If your student currently logs in through a secret picture or secret pair of words, the student may no longer be able to log into their account if you remove them from your section. If this is the case, please give your student a chance to keep using their Code.org account by letting them create a personal login.",
   "removeStudentConfirm2": "Send home these instructions on how to create a personal login.",
   "removeStudentConfirm3": "Give them at least a few days to follow these instructions before you remove them.",
+  "removeStudentSendHomeInstructions": "Send home instructions for creating a personal login",
   "removeStudentHeader": "Are you sure you want to remove this student?",
+  "removeUnusedStudentHeader": "Are you sure you want to remove {studentName}?",
   "rename": "Rename",
   "repeat": "repeat",
   "replayButton": "Replay",
@@ -964,6 +1021,7 @@
   "resetPassword": "Reset password",
   "resources": "Resources",
   "response": "Response",
+  "restoreSection": "Restore Section",
   "restoreThisVersion": "Restore this Version",
   "review": "Review",
   "reviewCode": "Review Code",
@@ -1025,6 +1083,7 @@
   "sectionViewProgress": "View Progress",
   "secret": "Secret",
   "seeAllTutorials": "See all tutorials",
+  "seePrivacyPolicy": "(See our privacy policy)",
   "selectACourse": "Select a course or unit",
   "selectAnOption": "Please select an option...",
   "selectAssessment": "Select an assessment or survey",
@@ -1206,6 +1265,7 @@
   "viewAllAnnouncements": "View all announcements",
   "viewAllCourses": "View all courses",
   "viewAllSections": "View all sections",
+  "viewArchivedSections": "View archived sections",
   "viewCode": "View code",
   "viewCourse": "View course",
   "viewCourses": "View courses",
@@ -1227,6 +1287,7 @@
   "whenRun": "when run",
   "whichCourse": "Don't know which course to teach? Find a course from the courses page to assign a course to your section later.",
   "withoutHints": "Without using any hints!",
+  "workshopDate": "Workshop Date",
   "workspaceHeaderShort": "Workspace: ",
   "workspaceProjectTemplateLevel": "This icon means that this level is part of a larger project. Changes will be saved across these levels.",
   "wrongCourseVersionWarningNotice": "You’re in a newer version of this course",

i18n/locales/source/dashboard/authored_hints.yml

@@ -10760,6 +10760,10 @@ en:
       courseE_farmer_concept4_authored_hint:
         4-5_Artist_Patterns_3_a: Be careful to pull out the full block of "code from the toolbar each time you try a new one.
         4-5_Artist_Patterns_3_b: If your code becomes too confusing, you can always click "Start Over" and try again!
+      courseE_farmer_elseif_test_authored_hint:
+        grade3_robotFarmer_ConditionalsIntro_8_a: The `while path ahead` block lets you keep going, even if you don't know how many squares are in a path.
+        grade3_robotFarmer_ConditionalsIntro_8_b: What should you do once you've reached the end of a path?
+        grade3_robotFarmer_ConditionalsIntro_8_c: Use a `repeat` loop to run your code multiple times for each straight path.
       courseE_farmer_functions1_authored_hint:
         courseE_farmer_functions1_a: The toolbox is organized a little differently this time! Click on the different categories to see which blocks you have.
         courseE_farmer_functions1_b: You only need to pick one pumpkin, but could you use a loop to get to it?