Merge branch 'main' into key_press_5679

.github/workflows/unlock-weblate.yml

@@ -31,6 +31,8 @@ jobs:
         echo 'https://hosted.weblate.org/api/ = ${{ secrets.WEBLATE_API_KEY }}' >> .weblate
     - run: |
         # Have to lock each component individually. Not in the UI, but using the CLI we do.
+        set -x
         for component in glossary adventures keywords quizzes commands client-messages web-texts webpages parsons tutorials slides; do
-          wlc unlock hedy/$component
-        done
+          wlc --debug unlock hedy/$component | sed 's/${{ secrets.WEBLATE_API_KEY }}/*****/g'
+        done
+        echo "All components unlocked!"

.github/workflows/update-weblate.yml

@@ -64,11 +64,26 @@ jobs:
         done
 
         wlc pull
+
+        # 'commit' seems to be an async process, as sometimes nothing is pushed if we run this
+        # too quickly in succession. Add a short sleep to reduce chances of this happening.
+        # https://github.com/WeblateOrg/weblate/issues/12400
         wlc commit
+        sleep 10
+
         wlc push
-        # On our repo, 'wlc reset' consistently times out the TCP connection after waiting
-        # for 5 minutes. The actual reset does seem to work, so we just don't wait for the
-        # command to finish, otherwise all our workflow executions show errors.
+        sleep 10
+
+        # Safety check: we should now see `needs_commit: False` and `needs_push: False`. If we don't,
+        # the 'wlc reset` below is going to lead to data loss.
+        wlc repo | tee repo.txt
+        if grep -q "needs_commit: True" repo.txt || grep -q "needs_push: True" repo.txt; then
+          echo "wlc commit and push combo didn't flush out all changes; aborting before we lose data!"
+          exit 1
+        fi
+
+        # 'wlc reset' always leads to ConnectionAborted, so don't wait for it.
+        # https://github.com/WeblateOrg/weblate/issues/11368
         wlc reset &
         sleep 10
 

.mergify.yml

@@ -4,6 +4,10 @@ queue_rules:
   - name: default_queue
     conditions:
         - "check-success=build"
+    merge_method: squash
+    commit_message_template: |-
+      {{ title }} (#{{number}})
+      {{ body }}
 
 pull_request_rules:
   - name: Automatic squash merge on approval
@@ -16,10 +20,4 @@ pull_request_rules:
     actions:
       comment:
         message: Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
-      queue:
-        name: default_queue
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{number}})
-          {{ body }}
 

content/adventures/pt_BR.yaml

@@ -2549,15 +2549,15 @@ adventures:
                     {else} {print} 'meh'
                     ```
                 story_text_2: |
-                    ### Exercise
-                    Finish the example code by filling in the blanks with commands that you've learned.
-                    When you've finished the code, try to create a code of your own and use a question that you've thought of yourself.
+                    ### Exercício
+                    Complete o código exemplo preenchendo as lacunas com comandos que você aprendeu.
+                    Quando tiver terminado, tente criar seu próprio código com sua própria pergunta.
                 example_code_2: |
                     ```
-                    animals is dog, cow, sheep
-                    answer is ask 'What is your favorite animal?'
-                    _ answer _ animals _ 'Mine too!'
-                    _ _ 'My favorite animals are dogs, cows and sheep'
+                    animais {is} cachorro, vaca, ovelha
+                    resposta {is} {ask} 'Qual é o seu animal favorito?'
+                    _ resposta _ animais _ 'O meu também!'
+                    _ _ 'Meus animais favoritos são cachorros, vacas e ovelhas.'
                     ```
     is_command:
         name: '{is}'
@@ -2594,39 +2594,41 @@ adventures:
                     ```
             14:
                 story_text: |
-                    We are going to learn more new items. You might know them already from mathematics, the `<` and `>`.
-                    The `<` checks if the first number is smaller than the second, for example age `<` 12 checks if age is smaller than 12.
-                    If you want to check if the first number is smaller or equal to the second, you can use `<=`, for example age `<=` 11.
-                    The `>` checks if the first number is bigger than the second, for example points `>` 10 checks if points is larger than 10.
-                    If you want to check if the first number is bigger or equal to the second, you can use `>=`, for example points `>=` 11.
-                    You use these comparisons in an `{if}`, like this:
+                    Vamos aprender mais itens novos. Você já deve conhecê-los da matemática, o `<` e o `>`.
+                    O `<` verifica se o primeiro número é menor que o segundo. Por exemplo, idade `<` 12 verifica se idade é menor que 12.
+                    Se quiser verificar se o primeiro número é menor ou igual ao segundo, você pode usar `<=`. Exemplo: age `<=` 11.
+                    The `>` verifica se o primeiro número é maior que o segundo. Por exemplo, pontos `>` 10 verifica se pontos é maior que 10.
+                    Se quiser verificar se o primeiro número é maior ou igual ao segundo, você pode usar `>=`. Exemplo: pontos `>=` 11.
+                    Essas comparações podem ser usadas em um `{if}`, assim:
                 example_code: |
                     ```
-                    age = {ask} 'How old are you?'
-                    {if} age > 12
-                        {print} 'You are older than I am!'
+                    idade = {ask} 'Quantos anos você tem?'
+                    {if} idade > 12
+                        {print} 'Você é mais velho(a) que eu!'
+                    ```
+                    ```
+                    idade = {ask} 'Quantos anos você tem?'
+                    {if} idade < 12
+                        {print} 'Você é mais novo(a) que eu!'
+                    {else}
+                        {print} 'Você é mais velho(a) que eu!'
                     ```
                 story_text_2: |
-                    From this level on, if you want to compare exactly, you can use two equal signs. This is what most programming languages do:
+                    Deste nível em diante, se quiser verificar uma igualdade exata, você pode usar dois sinais de igual. É assim na maioria das linguagens de programação:
                 example_code_2: |
                     ```
-                    name = {ask} 'What is your name?'
-                    {if} name == 'Hedy'
-                        {print} 'You are cool!'
+                    nome = {ask} 'Qual é o seu nome?'
+                    {if} nome == 'Hedy'
+                        {print} 'Você é legal!'
                     ```
                 story_text_3: |
-                    You can also compare if something is *not* equal to something else using `!=` like this:
+                    Você pode verificar se duas coisas são *diferentes* usando `!=`, desse jeito:
                 example_code_3: |
                     ```
-                    name = {ask} 'What is your name?'
-                    {if} name != 'Hedy'
-                        {print} 'You are not Hedy'
+                    nome = {ask} 'Qual é o seu nome?'
+                    {if} nome != 'Hedy'
+                        {print} 'Você não é Hedy'
                     ```
-
-                    {if} age < 13
-                        {print} 'You are younger than me!'
-                    {else}
-                        {print} 'You are older than me!'
     language:
         name: Língua
         default_save_name: Idioma
@@ -2666,9 +2668,9 @@ adventures:
                     {print} 'You gave ' score ' correct answers.'
                     ```
     maths:
-        name: maths
-        default_save_name: maths
-        description: Introducing maths
+        name: matemática
+        default_save_name: matemática
+        description: introduzindo matemática
         levels:
             6:
                 story_text: |
@@ -2680,17 +2682,18 @@ adventures:
                     That is why we multiply with the asterisk above 8: `5 * 5`. Read that as "5 times 5" that helps you remember it best.
                 example_code: |
                     ```
-                    {print} '5 plus 5 is ' 5 + 5
-                    {print} '5 minus 5 is ' 5 - 5
-                    {print} '5 times 5 is ' 5 * 5
+                    {print} '5 mais 5 é ' 5 + 5
+                    {print} '5 menos 5 é ' 5 - 5
+                    {print} '5 vezes 5 é ' 5 * 5
+                    {print} '5 dividido por 5 é ' 5 / 5
                     ```
             12:
                 story_text: |-
-                    **Decimal numbers**
-                    So far, Hedy did not allow for decimal numbers like 1.5, but now we do allow that. Note that computers use the `.` for decimal numbers.
+                    **Números Decimais**
+                    Até o momento, Hedy não permitia números decimais como 1.5. Deste nível em diante, você poderá usá-los. Note que computadores usam `.` em números decimais.
                 example_code: |
                     ```
-                    {print} 'Two and a half plus two and a half is...'
+                    {print} 'Dois e meio mais dois e meio é...'
                     {print} 2.5 + 2.5
                     ```
                 story_text_2: |-

content/cheatsheets/uk.yaml

@@ -162,7 +162,7 @@
 -   name: '{if} з багатьма лініями'
     explanation: Запитай про суму чисел за допомогою команди `{ask}` і перевір відповідь. Тепер ми друкуємо дві лінії.
     demo_code: |-
-        відповідь = {ask} "Скільки буде 10 додати 10?
+        відповідь = {ask} "Скільки буде 10 додати 10?"
         {if} відповідь {is} 20
             {print} 'Молодець!!!'
             {print} 'Відповідь дійсно' відповідь

content/keywords/de.yaml

@@ -5,8 +5,8 @@ at: an
 black: Schwarz
 blue: Blau
 brown: Braun
-call: call
-clear: abwischen
+call: aufruf
+clear: leere
 color: farbe
 comma: ','
 d0: '0'

content/pages/cs.yaml

@@ -58,15 +58,33 @@ learn-more-sections:
         [Klikni zde a pošli nám zprávu.](mailto:[email protected] "About Hedy")
 -   title: Objevil jsi nějaký bug?
     text: '[Dej nám vědět na GitHubu.](https://github.com/hedyorg/hedy/issues/new/choose)'
--   title: Záznam prezentace z Code Week
+-   title: Hedy v novinách
     text: |-
-        Chceš se dozvědět více o Hedy? Podívej se na prezentaci, kterou Felienne přednesla na European Code Week 2020:
-
-        <iframe width="560" height="315" class="mx-auto mt-4" src="https://www.youtube.com/embed/R2U9MEowYag?wmode=opaque" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>
+        Některé weby a noviny psaly o Hedy od našeho vydání na začátku roku 2020. Seznam si můžete prohlédnout zde:
+        * [Java Magazine 04.2023](images/Hedy_Javamagazine2023.pdf)
+        * [Tech Optimism - A Solution to the IT Shortage (Dutch), August 2022](https://pom.show/2022/08/12/een-oplossing-voor-het-it-tekort/)
+        * [Codeweek Podcast, July 2022](https://codeweek.eu/podcast/26)
+        * [Heise.de (German), Januari 2022](https://www.heise.de/news/Hedy-die-mitwachsende-Programmiersprache-6336264.html)
+        * [Strumenta, November 2021](https://tomassetti.me/teaching-programming-with-hedy/)
+        * [Vives (Dutch), CodeWeek Special October 2021](images/Vives-174-Codeweek.pdf)
+        * [CodeWeek.eu - Haunted House Challenge, September 2021](https://codeweek.eu/2021/challenges/haunted-house)
+        * [Opensource.com, April 2021](https://opensource.com/article/21/4/hedy-teach-code)
+        * [IO Magazine, April 2021](https://ict-research.nl/wordpress/wp-content/uploads/2021/04/IO-magazine-NR1-2021_web.pdf)
+        * [Ingeniería De Software (Spanish), February 2021](https://ingenieriadesoftware.es/hedy-mejor-lenguaje-ensenar-programacion-ninos/)
+        * [Hello World Magazine, February 2021](images/Hello_World_15_Hedy.pdf)
+        * [Discoro, January 2021](https://discoro.wordpress.com/2021/01/09/hedy-gradually-learning-a-programming-language/)
+        * [Felienne wins the Dutch award for ICT research for Hedy, January 2021](https://www.nwo.nl/en/news/felienne-hermans-receives-dutch-prize-ict-research-2021)
+        * [SlashDot, August 2020](https://news.slashdot.org/story/20/08/17/024248/scientist-proposes-a-new-programming-language-for-teaching-coding-and-python)
+        * [GenBeta (Spanish), August 2020](https://www.genbeta.com/desarrollo/nuevo-lenguaje-para-ensenar-programacion-a-ninos-como-se-ensena-a-leer-escribir-forma-gradual-niveles)
+        * [Developpez (French), August 2020](https://programmation.developpez.com/actu/308095/Une-scientifique-propose-un-nouveau-langage-de-programmation-pour-enseigner-aux-enfants-le-codage-informatique-au-travers-d-une-approche-graduelle-implementee-en-Python-sur-13-paliers/)
+        * [Vives (Dutch), October 2020](images/artikel_vives.pdf) "Met Hedy stap voor stap leren programmeren"
+        * [Leiden University, April 2020](https://www.universiteitleiden.nl/en/news/2020/03/looking-to-distract-the-kids-while-you-work-from-home-get-them-programming)
+        * [Mare (Dutch), April 2020](https://www.mareonline.nl/cultuur/computercode-voor-de-kids/)
+        * [AG Connect (Dutch), April 2020](https://www.agconnect.nl/artikel/stapsgewijs-python-leren-programmeren-met-nieuwe-taal-hedy)
 start-sections:
--   title: Getting started with Hedy
+-   title: Začínáme s Hedy
     text: '*Something about teachers accounts, slides etc*'
--   title: What other teachers say
+-   title: Učitelé o Hedy
     text: "A while ago we ran a few short Hedy teachers surveys. \nThe questions span between suggestions of improvement and Hedy’s best features. \nBelow is a testimony of their thoughts:\n\nSimple interface and good examples. *Teacher: 3rd - 6th grades (elementary)*\n\nMultilingual programming and just the gradual programming concept itself. - *US: middle school, 6th-8th grade*\n\nThe gradual nature of introducing programming. *Australia: High school*\n\nThe construction is so good. *Netherlands: Lower secondary school HAVO-VWO*\n\nI can keep the pace of the class. *Netherlands: group 7 en 8* \n\nContinues automatically. *Netherlands: 2 HAVO-VWO*\n\nBoth that the explanation can be in Dutch (and the code in English), and that it builds up with more \nand more possibilities. *Netherlands: Plus class group 7*\n\nThe 'realness' of programming, it resembles how it is in reality. *Netherlands: Plus class group 4 to 8*\n\nStep-by-step activities. Fun activities. *Netherlands: 1e All levels, 2e VWO/HAVO 2e VWO +, 3e HAVO 3e VWO*\n\nBut Hedy and its gradual levels... what an idea, \nI wanted to personally thank you for creating this. I cannot thank you enough. Also, I have never seen the level of engagement and enthusiasm of my \nstudents, as I have seen with Hedy. We have covered till level 5, and plan to spend one more week on it in classes and labs, \nbefore starting Python.  *Pakistan*\n\nI really like Hedy very much and it is also nicely set up, which makes it good to use in primary school. \nHedy's gradual approach works very well. \nThe short explanation at the beginning of each level and the short example programs help to give the children a quick insight into what is new in the chosen level. \nThe different assignments that the children can choose also work very well. \nYou see the children choose assignments that appeal to them and they then get to work with them, \nthrough the levels. Hedy is great fun for children who are good at programming and want to get a \ntaste of a real programming language. It is good preparation for secondary school as soon as more ICT \neducation is given there. *Netherlands: Oegstgeest Montessori school*\n\n<img width=\"500px\" src=\"static/images/teacherfeedback/Fkids1.JPG\"></img>"
 teacher-guide:
 -   title: Introduction
@@ -121,8 +139,8 @@ teacher-guide:
 -   title: Teaching preparations
     key: preparations
     subsections:
-    -   title: For teachers
-        text: You can prepare your classes at the <a href="https://hedy.org/for-teachers" target="_blank">For Teachers page</a>. On this page you'll find everything you'll need to teach with Hedy, like your classes, your adventures and slides. All the functionalities of the for teachers page are explained below.
+    -   title: Pro učitele
+        text: Své hodiny můžete připravit na stránce <a href="https://hedy.org/for-teachers" target="_blank">Pro učitele</a>. Najdete zde vše potřebné pro výuku s Hedy, jako jsou vaše třídy, dobrodružství a prezentace. Všechny funkce stránky pro učitele jsou vysvětleny níže.
     -   title: Creating a Class
         text: |-
             As a teacher, you can create a class for your students. In this class you can see the students' accounts and their programs and you could monitor their progress.