Fix more Weblate merge conflicts

content/adventures/uk.yaml

@@ -95,8 +95,10 @@ adventures:
                 example_code: |
                     ```
                     name {is} {ask} _ Як вас звати? _
-                    {print}   _ Головного героя звуть _ name
-                    {print} name   _ тепер буде гуляти в лісі _
+                    {print} _ Головного героя звуть _ name
+                    _
+                    _
+                    {print} name _ тепер буде гуляти в лісі _
                     {print} name _ трохи налякан. _
                     animals {is} 🦔, 🐿, 🦉, 🦇
                     {print} _ Він чує звук _ animals {at} {random}
@@ -122,7 +124,7 @@ adventures:
                     ```
                     мення {is} {ask} 'Хто йде лісом?'
                     {print} мення 'гуляє лісом'
-                    {print}  'зустрічає монстра'
+                    {print} 'зустрічає монстра'
                     кінець {is} {ask} 'Ви хочете гарний чи поганий кінець?'
                     {if} кінець {is} хороший {print} мення 'бере меч і монстр швидко тікає'
                     {else} {print} "Монстр з'їдає" мення

content/adventures/zh_Hans.yaml

@@ -3520,7 +3520,7 @@ adventures:
                     ```
             12:
                 story_text: |
-                    从这一层开始，你可以使用小数点后的数字来使你的菜单更加真实。
+                    从这一级别开始，你可以使用小数点后的数字来使你的菜单更加真实。
 
                     ### 练习
                     你能构思出一个代码来给你的朋友和家人提供15%的折扣吗？
@@ -3765,7 +3765,7 @@ adventures:
                 example_code: |
                     ```
                     名字 = {ask} '你的名字是什么？'
-                    {if} 名字 {is} _
+                    {if} 名字 {is}  _
                         a = '去机场'
                     {else}
                         a = '去火车站'
@@ -3784,7 +3784,7 @@ adventures:
                     通过在空白处填写正确的命令来完成代码。提示:超级间谍必须正确回答这两个问题，才能获得机密信息!
 
                     ### 练习2
-                    我们要更加迷惑敌人!创建一个假答案列表，当给出错误答案时随机选择一个。
+                    我们要令敌人更加迷惑! 创建一个假答案列表，当给出错误答案时随机选择一个。
                 example_code: |
                     ```
                     名字 = {ask} '你的名字是什么？
@@ -3995,7 +3995,7 @@ adventures:
                     ```
                     {define} 闪亮
                         {print} '闪亮'
-                        {print} '...'
+                        {print} _
 
                     {call} 闪亮
                     {print} '高高地在天空上'

content/parsons/sl.yaml

@@ -11,15 +11,15 @@ levels:
             story: "S prijatelji boste gledali Netflix.\nPokažite, kateri film boste gledali, in zaželite gledalcem veliko zabave!"
             code: "{print} Čas je za Netflix večer\nfilm {is} Ježek Sonic 2\n{print} Ogledali si bomo film\n{print}. Zabavajte se!"
         2:
-            story: This is the webshop of a toy store. Create a program where costumers can add an item to their shopping cart.
-            code: "{print} Welcome to our toystore\ntoy {is} {ask} What would you like to buy?\n{print} toy is added to your shopping cart.\n{print} Thank you for shopping with us!"
+            story: To je spletna trgovina z igračami. Ustvarite program, v katerem lahko kupci dodajo predmet v nakupovalno košarico.
+            code: "{print} Dobrodošli v naši trgovini z igračami\nigrača {is} {ask} Kaj bi radi kupili?\n{print} igrača je dodana v vašo košarico.\n{print} Hvala, ker ste nakupovali pri nas!"
     3:
         1:
             story: "The new school year at Hogwarts is starting! \nIt is the job of the sorting hat to sort you into one of the houses.\nWhich house will you be sorted into? Are you a Gryffindor, Hufflepuff, Ravenclaw or Slytherin.\nBefore the sorting hat reveals your house, you can tell it to not pick one of the houses."
             code: "{print} The sorting hat is ready to sort you into a Hogwarts house.\nhouses {is} Gryffindor, Hufflepuf, Ravenclaw, Slytherin\ndislike {is} {ask} Are there any houses you do not want to be part of?\n{remove} dislike {from} houses\n{print} Not dislike eh? Better be... houses {at} {random}"
         2:
-            story: Create a program that chooses a random meal for you. Make a list of food and a list of toppings and let the program decide what you'll have!
-            code: "food {is} pizza, icecream, salad, sandwich\ntoppings {is} chocolate, cheese, tuna, sprinkles\n{print} Your random meal for today is...\n{sleep} 2\n{print} food {at} {random} with toppings {at} {random}"
+            story: Ustvarite program, ki bo za vas izbral naključni obrok. Sestavite seznam jedi in seznam prelivov ter pustite programu, da odloči, kaj boste jedli!
+            code: "hrana {is} pica, sladoled, solata, sendvič\ndodatki {is} čokolada, sir, tuna, mrvice\n{print} Vaš naključni obrok za danes je...\n{sleep} 2\n{print} hrana {at} {random} z dodatki {at} {random}"
         3:
             story: "In a chess tournament there are three players left.\nCreate a program that decides which two players have to play against each other first.\nStart by printing the two players who play the first match, then print against which player the winner will play."
             code: "players {is} Liam, Noah, Sophie\nplayer_1 {is} players {at} {random}\n{remove} player_1 {from} players\nplayer_2 {is} players {at} {random}\n{print} player_1 ' first plays against ' player_2\n{remove} player_2 {from} players\n{print} 'The winner plays against ' players {at} {random}"

translations/zh_Hans/LC_MESSAGES/messages.po

@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2000-01-01 00:00+0000\n"
 "PO-Revision-Date: 2000-01-01 00:00+0000\n"
-"Last-Translator: Someone <someone@example.com>\n"
+"Last-Translator: \"Zoom.Quiet\" <zoomquiet+gh@gmail.com>\n"
 "Language: zh_Hans\n"
 "Language-Team: zh_Hans <[email protected]>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -105,13 +105,11 @@ msgstr "保存 Microbit 代码"
 msgid "Too Big"
 msgstr "哇！你的程序有足足{lines_of_code}行代码！但是这一关只能用{max_lines}行代码。把你的程序改得短一点，然后再试一次。"
 
-#, fuzzy
 msgid "Too Few Indents"
-msgstr "You used too few leading spaces in line {line_number}. You used {leading_spaces} spaces, which is too few."
+msgstr "您在第 {line_number} 行中使用的前导空格太少。 您使用了 {leading_spaces} 个空格，这太少了。"
 
-#, fuzzy
 msgid "Too Many Indents"
-msgstr "You used too many leading spaces in line {line_number}. You used {leading_spaces} spaces, which is too many."
+msgstr "您在第 {line_number} 行中使用了太多前导空格。 您使用了 {leading_spaces} 个空格，这太多了。"
 
 msgid "Unexpected Indentation"
 msgstr "第{line_number}行的空格太多了。你空了{leading_spaces}格，这样太多。每个新的代码块都要比前一行多{indent_size}个空格。"
@@ -125,19 +123,17 @@ msgstr "如果你想检查一个变量的内容是否是一些词，那就需要
 msgid "Unquoted Text"
 msgstr "当心。 如果您`{ask}`或`{print}`某些内容，则文本应以引号开头和结尾。 您忘记了文本 {unquotedtext} 的内容。"
 
-#, fuzzy
 msgid "Unsupported Float"
-msgstr "现在暂不支持非整数，但是再过几关就会支持了。当下先把{value}改成整数。"
+msgstr "尚不支持非整数，但它们将在几个级别上支持。 现在将`{value}`更改为整数。"
 
 msgid "Unsupported String Value"
 msgstr "文本值不能包含`{invalid_value}`。"
 
 msgid "Unused Variable"
 msgstr "您在第{line_number}行定义了变量{variable_name}，但没有使用它。"
 
-#, fuzzy
 msgid "Var Undefined"
-msgstr "你试图使用变量 {name}，但你没设置过这个变量。也有可能是你想输入 {name} 这个词，但是忘记加引号了。"
+msgstr "您尝试使用变量`{name}`, 但没有设置它。 也有可能您尝试使用单词`{name}`但忘记了引号。"
 
 msgid "Wrong Level"
 msgstr "这是正确的海蒂代码，但不是在正确的关卡。你在第{working_level}关用了`{offending_keyword}`。提示：{tip}"
@@ -199,9 +195,8 @@ msgstr "您已经使用此名称进行了一次探险活动。"
 msgid "adventure_empty"
 msgstr "你没有输入一个探险活动的名字！"
 
-#, fuzzy
 msgid "adventure_exp_3"
-msgstr "确保始终用 { } 括住关键字，然后才能正确识别它们。 您可以使用“预览”按钮查看冒险的风格版本。 要在专用页面上查看冒险，请从教师页面中选择“查看”。"
+msgstr "当您在代码块之外编写关键字时，请确保始终用 { } 将关键字括起来，然后才能正确识别它们。 您可以使用“预览”按钮查看冒险的风格版本。 要在专用页面上查看冒险，请从教师页面中选择“查看”。"
 
 msgid "adventure_exp_classes"
 msgstr "您的冒险将在以下类中使用"
@@ -275,9 +270,8 @@ msgstr "你确定吗？ 你无法撤销此操作。"
 msgid "ask_needs_var"
 msgstr "从第2关开始，`{ask}`需要和变量共同使用。例子：名字`{is}` `{ask}`你叫什么？"
 
-#, fuzzy
 msgid "available_in"
-msgstr "Available in:"
+msgstr "适用于："
 
 msgid "become_a_sponsor"
 msgstr "成为赞助商"
@@ -1015,9 +1009,8 @@ msgstr "强制开发者模式"
 msgid "more_options"
 msgstr "更多选项"
 
-#, fuzzy
 msgid "multiple_levels_warning"
-msgstr "We've noticed you have both selected several levels and included code snippets in your adventure, this might cause issues with the syntax highlighter and the automatic translation of keywords"
+msgstr "我们注意到您在冒险中选择了多个级别并包含代码片段，这可能会导致语法突出显示和关键字自动翻译出现问题"
 
 msgid "my_account"
 msgstr "我的账户"
@@ -1532,9 +1525,8 @@ msgstr "单引号"
 msgid "slash"
 msgstr "斜杠"
 
-#, fuzzy
 msgid "sleeping"
-msgstr "Sleeping..."
+msgstr "休眠..."
 
 msgid "slides"
 msgstr "幻灯"
@@ -1844,9 +1836,8 @@ msgstr "程序中空格的使用"
 msgid "use_of_nested_functions_exception"
 msgstr "嵌套函数的使用"
 
-#, fuzzy
 msgid "used_in"
-msgstr "Used in:"
+msgstr "用于："
 
 msgid "user"
 msgstr "用户"