AlmaLinux / almalinux.org

almalinux.org official web site sources.
https://almalinux.org
Creative Commons Attribution Share Alike 4.0 International
40 stars 51 forks source link

Translations update from Hosted Weblate #555

Closed weblate closed 4 months ago

weblate commented 4 months ago

Translations update from Hosted Weblate for AlmaLinux Foundation/almalinux.org.

Current translation status:

Weblate translation status

bennyvasquez commented 4 months ago

I've opened a ticket with weblate to ask them about this. https://care.weblate.org/#ticket/zoom/8384 (linked to my weblate account, but including the link here so I don't lose it)

bennyvasquez commented 4 months ago

Hello Benny,

You can see there are commits in the pull request, but the changes from it are already merged in the upstream repository. Seems like you are merging pull requests differently (using rebase) than configured in Weblate (using merge commit). That way, Weblate doesn't see that the commits have been merged upstream. Please consider using a consistent merge strategy on both sides.

Best regards,

@jonathanspw @codyro figured out this was my fault. I was squashing the merges into a single commit that didn't match what they were tracking. Merging without squashing the commits fixed it.