Skip to content

New Crowdin updates #12878

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

Merged
merged 6 commits into from
Jun 4, 2025
Merged

New Crowdin updates #12878

merged 6 commits into from
Jun 4, 2025

Conversation

PX4BuildBot
Copy link
Collaborator

No description provided.

@hamishwillee
Copy link
Contributor

I hope to look at this conflict tomorrow.

@hamishwillee
Copy link
Contributor

We are getting conflicts sometimes when the line looks like this:

image

The translator has provided a translation which updates the translation with a value, and removes the unfinished attribute. A conflict occurs if that same line has other modifications at the same time. But I can't see any.
I'll merge this, and again look more closely next time there is an error to see what else might be writing to the that source file.

@hamishwillee hamishwillee merged commit 423a349 into master Jun 4, 2025
10 checks passed
@hamishwillee hamishwillee deleted the l10n_master_docs branch June 4, 2025 01:06
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