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

Added Russian translation for missing phrases (2.1.1) #6778

Merged
merged 8 commits into from
Sep 18, 2024

Conversation

andrey-helldar
Copy link
Contributor

Description

Screenshots/Recordings/Graphs

Tests

Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you take a look at the errors reported by the CICD?

@andrey-helldar
Copy link
Contributor Author

@SoftFever Yeah, no problem. The tests didn't run before. I'll take a look at them now and fix them.

@@ -13764,8 +14062,8 @@ msgstr ""
"органический). В то время как гибридный стиль создаёт структуру, схожую с "
"обычную поддержкой при больших плоских нависаниях."

msgid "Default (Grid/Organic"
msgstr ""
msgid "Default (Grid/Organic)"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
msgid "Default (Grid/Organic)"
msgid "Default (Grid/Organic"

Reverted the change of the key by which the translation is searched.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave it as undecided so that this change can be seen.

@SoftFever
Copy link
Owner

Thanks @andrey-helldar
Seems there are some errors remaining.

Unfortunately, the check won't run automatically for the first time contributor, I have to manually trigger it.

@@ -10963,9 +11118,27 @@ msgid ""
"and for when tool changing.\n"
"\n"
msgstr ""
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SoftFever I fixed two of the bugs, but there was a problem with the third. I have reconsidered the formation of the string itself and I don't understand what it is complaining about:

./localization/i18n/ru/OrcaSlicer_ru.po:11120: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason: The character that terminates the directive number 1 is not a valid conversion specifier.

In this place, the only thing to pick on is the “%” symbol. But it occurs once, just like in the original text.

I also compared its occurrence with other translation keys, as well as the c-format format, and I don't understand what could be the reason. Any ideas how to fix it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the format checking, but I don't know if that's the right thing to do. Although after that the tests passed successfully.

image

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is fine.
Sometimes the get text will confuse.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it 👍

Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good
Thank you!

@SoftFever SoftFever merged commit ad99c30 into SoftFever:main Sep 18, 2024
1 check passed
@andrey-helldar andrey-helldar deleted the andrey-helldar-patch-1 branch September 18, 2024 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants