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

Translations update from Hosted Weblate #3284

Merged
merged 5 commits into from
Aug 3, 2024

Conversation

weblate
Copy link
Contributor

@weblate weblate commented May 29, 2024

Translations update from Hosted Weblate for Jamulus/Jamulus app.

It also includes following components:

Current translation status:

Weblate translation status

@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch 3 times, most recently from bda6c1b to 056f902 Compare June 14, 2024 15:30
@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch 3 times, most recently from 40b9c78 to 5683dd3 Compare June 26, 2024 09:08
@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch from 5683dd3 to dbfb02d Compare June 30, 2024 08:32
@pljones
Copy link
Collaborator

pljones commented Jun 30, 2024

Is this related to 3.11.0? We need to get it into the Tracking project with a milestone, if so.

@softins softins added this to the Release 3.11.0 milestone Jul 1, 2024
Copy link
Member

@softins softins left a comment

Choose a reason for hiding this comment

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

@mansil I see there are several places where Diretório (meaning directory) has been replaced with Pasta (meaning folder). This may be fine when referring to a directory/folder in a file system, but doesn't make sense when referring to a Directory Server. For example line 3895. A Directory Server should use the same kind of word as for Telephone Directory.

src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch 5 times, most recently from ff741bd to 080289e Compare July 3, 2024 20:23
@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch from 080289e to c0eecdb Compare July 11, 2024 16:37
@ann0see
Copy link
Member

ann0see commented Jul 11, 2024

@softins probably it's worth reverting the directory thing?

@softins
Copy link
Member

softins commented Jul 11, 2024

@softins probably it's worth reverting the directory thing?

I guess this needs to be done via weblate? I can look up how to use that, but I'm a bit busy for a couple of days.

@ann0see
Copy link
Member

ann0see commented Jul 11, 2024

No problem. Yes, it works over weblate.

@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch 2 times, most recently from fbd0b21 to 6680010 Compare July 21, 2024 19:56
Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

Not sure what to do here. I believe we'd need to check with a pt_PT speaker.

@ann0see
Copy link
Member

ann0see commented Jul 30, 2024

@ignotus666 @softins how should we handle this?
There are now conflicts since the translation files have been updated - pt_PT has potential errors.

@softins
Copy link
Member

softins commented Jul 30, 2024

I can look later this week. The pt_PT PR has some translation errors in any case, conflating "directory" and "folder", which doesn't work for a directory server. I have signed up for weblate, but haven't yet had time to play with it. Also, it says the jamulus project is locked, so I don't know if I need to be given some permissions.

@ann0see
Copy link
Member

ann0see commented Jul 30, 2024

Yes. I gave you permissions.

@softins
Copy link
Member

softins commented Jul 30, 2024

I think the problem here was that I committed an lupdate direct to main (de60e5e) while there was still a pending PR from weblate that hadn't been amended or merged.

The fact that the lupdate changed some of the line numbers referenced in the .ts files is what has caused the merge conflicts. But I didn't foresee that at the time - sorry!

I'l wondering if it might be easiest to revert de60e5e temporarily, then get the pending updates validated and merged, and then redo the lupdate afterwards.

Currently translated at 100.0% (609 of 609 strings)

Translation: Jamulus/Jamulus app
Translate-URL: https://hosted.weblate.org/projects/jamulus/jamulus-app/pt_PT/
mansil and others added 3 commits August 2, 2024 17:24
Currently translated at 100.0% (17 of 17 strings)

Translation: Jamulus/Windows Installer
Translate-URL: https://hosted.weblate.org/projects/jamulus/windows-installer/pt_PT/
Currently translated at 100.0% (609 of 609 strings)

Translation: Jamulus/Jamulus app
Translate-URL: https://hosted.weblate.org/projects/jamulus/jamulus-app/sv/
Currently translated at 100.0% (609 of 609 strings)

Translation: Jamulus/Jamulus app
Translate-URL: https://hosted.weblate.org/projects/jamulus/jamulus-app/pt_PT/
@weblate weblate force-pushed the weblate-jamulus-jamulus-app branch from caca570 to 3d490a1 Compare August 2, 2024 15:24
src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
src/translation/translation_pt_PT.ts Outdated Show resolved Hide resolved
@softins
Copy link
Member

softins commented Aug 2, 2024

I'l wondering if it might be easiest to revert de60e5e temporarily, then get the pending updates validated and merged, and then redo the lupdate afterwards.

That's what I've done. The merge conflicts are no longer present, and weblate has unlocked the translation again automatically. I still have concerns about the ps_PT translation as mentioned above. I have asked @melcon via Discord if he would comment.

Currently translated at 100.0% (609 of 609 strings)

Translation: Jamulus/Jamulus app
Translate-URL: https://hosted.weblate.org/projects/jamulus/jamulus-app/pt_PT/
@softins
Copy link
Member

softins commented Aug 3, 2024

The last commit 3d189f2 contains the reversions and a few other changes I did in weblate. I think this PR should be good enough to merge now. Any deficiencies discovered later could be dealt with separately. It would allow us to then get the lupdate into main ready for the final translations for 3.11.0.

I'm assuming the Swedish changes done by @genesisproject2020 will be fine.

Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

Please approve and merge it then if you believe it's ok. I cannot comment.

@ann0see ann0see merged commit b92cfeb into jamulussoftware:main Aug 3, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants