-
Notifications
You must be signed in to change notification settings - Fork 291
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix more Weblate merge conflicts (#5306)
New commits have been created in Weblate before it could pull the last set of conflict resolutions, so we need to do it some more.
- Loading branch information
Showing
4 changed files
with
23 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 "用户" | ||
|
|
||