Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve Weblate merge conflicts #5346

Merged
merged 11 commits into from
Apr 1, 2024
Merged

Resolve Weblate merge conflicts #5346

merged 11 commits into from
Apr 1, 2024

Conversation

rix0rrr
Copy link
Collaborator

@rix0rrr rix0rrr commented Apr 1, 2024

No description provided.

Snoring Parrot and others added 9 commits April 1, 2024 09:10
Currently translated at 74.2% (514 of 692 strings)

Co-authored-by: Snoring Parrot <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/pt_BR/
Translation: Hedy/Adventures
Currently translated at 64.5% (1410 of 2185 strings)

Translated using Weblate (English)

Currently translated at 100.0% (2185 of 2185 strings)

Translated using Weblate (French)

Currently translated at 90.0% (45 of 50 strings)

Translated using Weblate (French)

Currently translated at 82.6% (572 of 692 strings)

Translated using Weblate (French)

Currently translated at 64.4% (1409 of 2185 strings)

Translated using Weblate (French)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (English)

Currently translated at 100.0% (2185 of 2185 strings)

Co-authored-by: Étienne Charignon <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/fr/
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/fr/
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/fr/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/en/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/fr/
Translation: Hedy/Adventures
Translation: Hedy/Keywords
Translation: Hedy/Parsons
Translation: Hedy/Quizzes
Currently translated at 9.1% (57 of 621 strings)

Translated using Weblate (Slovenian)

Currently translated at 12.9% (282 of 2185 strings)

Translated using Weblate (Slovenian)

Currently translated at 46.0% (23 of 50 strings)

Co-authored-by: Jernej Vidmar <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sl/
Translation: Hedy/Parsons
Translation: Hedy/Quizzes
Translation: Hedy/Texts
Currently translated at 100.0% (621 of 621 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2185 of 2185 strings)

Co-authored-by: Zoom.Quiet <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/zh_Hans/
Translation: Hedy/Quizzes
Translation: Hedy/Texts
Currently translated at 100.0% (2185 of 2185 strings)

Translation: Hedy/Quizzes
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/en/
Currently translated at 65.9% (1440 of 2185 strings)

Translation: Hedy/Quizzes
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/fr/
Currently translated at 100.0% (2185 of 2185 strings)

Translation: Hedy/Quizzes
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/en/
Currently translated at 66.0% (1444 of 2185 strings)

Translation: Hedy/Quizzes
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/fr/
@rix0rrr rix0rrr added the translations Used for Weblate-related PRs, for special automatic processing. Do not set on any other PR. label Apr 1, 2024
Copy link
Contributor

github-actions bot commented Apr 1, 2024

The automatic script made changes

content/parsons/sl.yaml

There was a problem in a level 4 snippet:

Caution

Be careful. If you ask or print something, the text should start and finish with a quotation mark. You forgot that for the text nagrada "Kaj bi radi zadeli?. at line [2]

Translation source

nagrada {is} avto, hrček, 1 milijon evrov
nagrada {is} {ask} "Kaj bi radi zadeli? <---- ERROR HERE
{add} nagrada {to_list} nagrade
{print} 'Osvojili ste ' nagrade {at} {random}

Translated version

nagrada je avto, hrček, 1 milijon evrov
nagrada je vprašaj "Kaj bi radi zadeli? <---- ERROR HERE
dodaj nagrada do nagrade
izpiši 'Osvojili ste ' nagrade pri naključno

This snippet has been reverted to English.

content/parsons/sl.yaml

There was a problem in a level 5 snippet:

Caution

The code you entered is not valid Hedy code. There is a mistake on line 4, at position 22. You typed a comma, but that is not allowed. at line (4, 22)

Translation source

priljubljeni_filmi {is} Batman, Spiderman, Maščevalci, Jurski park
film {is} {ask} 'Kateri film vam je najbolj všeč?'
{if} film {in} priljubljeni_filmi {print} 'Imate odličen okus!'
{else} {print} "Škoda, da vašega najljubšega filma ni na seznamu, takoj ga bomo dodali! <---- ERROR HERE
{add} film {to_list} priljubljeni_filmi

Translated version

priljubljeni_filmi je Batman, Spiderman, Maščevalci, Jurski park
film je vprašaj 'Kateri film vam je najbolj všeč?'
če film v priljubljeni_filmi izpiši 'Imate odličen okus!'
drugače izpiši "Škoda, da vašega najljubšega filma ni na seznamu, takoj ga bomo dodali! <---- ERROR HERE
dodaj film do priljubljeni_filmi

This snippet has been reverted to English.

content/parsons/sl.yaml

There was a problem in a level 5 snippet:

Caution

Be careful. If you ask or print something, the text should start and finish with a quotation mark. You forgot that for the text "Pravilno!. at line [3]

Translation source

{print} 'Rešite ta problem'
odgovor {is} {ask} '88 - 16 = ?'
{if} odgovor {is} 72 {print} "Pravilno! <---- ERROR HERE
{else} {print} "Napačno! Odgovor je bil 72

Translated version

izpiši 'Rešite ta problem'
odgovor je vprašaj '88 - 16 = ?'
če odgovor je 72 izpiši "Pravilno! <---- ERROR HERE
drugače izpiši "Napačno! Odgovor je bil 72

This snippet has been reverted to English.

content/parsons/sl.yaml

There was a problem in a level 6 snippet:

Caution

Be careful. If you ask or print something, the text should start and finish with a quotation mark. You forgot that for the text 'V mačjih letih ste stari ' mačja_starost' '.'. at line [5]

Translation source

starost = {ask} 'Koliko ste stari?'
pasja_starost = starost * 7
mačja_starost = starost * 5
{print} 'V pasjih letih ste stari ' pasja_starost '.'
{print} 'V mačjih letih ste stari ' mačja_starost' '.' <---- ERROR HERE

Translated version

starost = vprašaj 'Koliko ste stari?'
pasja_starost = starost * 7
mačja_starost = starost * 5
izpiši 'V pasjih letih ste stari ' pasja_starost '.'
izpiši 'V mačjih letih ste stari ' mačja_starost' '.' <---- ERROR HERE

This snippet has been reverted to English.

Copy link
Contributor

mergify bot commented Apr 1, 2024

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).

@mergify mergify bot merged commit 1e6b305 into main Apr 1, 2024
12 checks passed
@mergify mergify bot deleted the weblate-merge-conflicts branch April 1, 2024 12:32
Copy link
Contributor

mergify bot commented Apr 1, 2024

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).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translations Used for Weblate-related PRs, for special automatic processing. Do not set on any other PR.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants