Skip to content
This repository has been archived by the owner on Dec 3, 2024. It is now read-only.

i18n: Use proper Unicode ellipsis, other clean-ups #2005

Merged
merged 8 commits into from
Nov 15, 2023

Conversation

acolomb
Copy link
Member

@acolomb acolomb commented Nov 12, 2023

Update all strings.xml translation files to replace triple full-stop with proper Unicode ellipsis. Fix other syntax problems and cosmetics in translation source strings.xml.

Update all strings.xml translation files.
@acolomb acolomb force-pushed the ellipsis branch 2 times, most recently from 0154b37 to 92b4760 Compare November 12, 2023 21:57
@acolomb acolomb changed the title i18n: Replace triple full stop with proper Unicode ellipsis. i18n: Use proper Unicode ellipsis, other clean-ups Nov 12, 2023
imsodin
imsodin previously approved these changes Nov 13, 2023
@acolomb acolomb requested a review from imsodin November 13, 2023 19:54
imsodin
imsodin previously approved these changes Nov 14, 2023
@acolomb
Copy link
Member Author

acolomb commented Nov 14, 2023

Oh my... I guess we screwed up on this. Translation cleanup here, ongoing changes in Weblate, merging of the Weblate PR. That all happened in suboptimal order, now leading to conflicts everywhere.

Let me try to sort this out.

@imsodin
Copy link
Member

imsodin commented Nov 14, 2023

Crap, sorry - I thought it was all ready to "just use" and wanted to get the translations into the release. Clearly I was too eager resp. I should have realized this was still open before releasing, somehow I thought it was merged after my approval. I hope the mess isn't too bad.

@acolomb
Copy link
Member Author

acolomb commented Nov 14, 2023

Not your fault I guess. Weblate just made a new attempt #2007, which contained no actual changes. But it failed to rebase its internal branch onto main even after merging that new PR. I did a reset there now, after verifying that there were no actual outstanding changes. Let's see how it behaves next time...

I'm really not sure what parameters would work best for avoiding these conflicts. Merging PR more often? Shorter commit interval to make sure it doesn't miss latest changes? But it does commit changes, rebases and pushes to the PR at the latest when detecting new upstream commits.

Do we have the Webhook enabled here? See https://docs.weblate.org/en/latest/admin/continuous.html#automatically-receiving-changes-from-github

@acolomb
Copy link
Member Author

acolomb commented Nov 15, 2023

Anyway, this clean-up is a special occasion. As long as only regular translation updates trickle in through Weblate, I expect less conflict situations. Just need one more approval now on this PR because I had to fix the conflicts. Best done before the next Weblate PR pops up.

Copy link
Member

@imsodin imsodin left a comment

Choose a reason for hiding this comment

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

approved but I'll leave the merge to you, I don't grok the ordering constraints.

If you need me to approve and merge in a next iteration (hopefully that won't be necessary), please say so and I'll gladly do that of course.

@acolomb acolomb merged commit d3fe7fe into syncthing:main Nov 15, 2023
1 check passed
@acolomb acolomb deleted the ellipsis branch November 15, 2023 17:25
@acolomb
Copy link
Member Author

acolomb commented Nov 15, 2023

Ok, I was a bit late, 18 minutes after the next change had trickled in on Weblate. But it worked without conflicts and we now have a new translation PR #2010 ready for you to merge at will.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants