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

Update es_ES app translation for 3.10.0 #3122

Closed
pljones opened this issue Jul 30, 2023 · 11 comments
Closed

Update es_ES app translation for 3.10.0 #3122

pljones opened this issue Jul 30, 2023 · 11 comments
Assignees
Labels
translation used by tools/create-translation-issues.sh

Comments

@pljones
Copy link
Collaborator

pljones commented Jul 30, 2023

Hi @ignotus666,
We are getting ready for the 3.10.0 release. No further changes to translatable strings are currently planned for this release.

We would be happy if you updated the Jamulus software translations for es_ES by 2023-08-20.

Please either update the translations on Hosted Weblate or use Git:

  • Update your fork from jamulussoftware/jamulus main and create a working branch
  • Update translations using Qt Linguist in your fork,
  • Commit and push your changes and reference this Issue,
  • Open a Pull Request before 2023-08-20

Suggested commit and PR message:

Update es_ES app translation for 3.10.0

Fixes #3122

Further documentation can be found in TRANSLATING.md.

Thanks for contributing to Jamulus!

Translation status

@pljones pljones added the translation used by tools/create-translation-issues.sh label Jul 30, 2023
@pljones pljones added this to the Release 3.10.0 milestone Jul 30, 2023
@ann0see
Copy link
Member

ann0see commented Jul 31, 2023

Closing as #3119 includes translation by @ignotus666

@ann0see ann0see closed this as completed Jul 31, 2023
@ann0see
Copy link
Member

ann0see commented Jul 31, 2023

You already know that probably, but I messed up. @ignotus666 could you please check if the weblate PR #3119 is correct?

@ignotus666
Copy link
Contributor

@ann0see looks good. But a bunch of stuff got lost from the website translation. Did this happen because an EN PR got merged before the Weblate stuff? When that happens isn't the easiest fix to just revert the offending PR, merge the Weblate PR, and then merge it? It's what I did on previous occasions and it wasn't too much hassle.

@ann0see
Copy link
Member

ann0see commented Jul 31, 2023

merge the Weblate PR, and then merge it? It's what I did on previous occasions and it wasn't too much hassle.

Yes. But there was no new weblate PR. The stuff was not yet committed on weblate.

@ignotus666
Copy link
Contributor

Ah, I see.

@ignotus666
Copy link
Contributor

I think I recall a discussion about preventing changes to EN files being merged if a weblate PR was present, but it still wouldn't protect against this scenario. Maybe a warning in the PR template to make sure everything has been committed, pushed and merged from Weblate first as a reminder?

@ann0see
Copy link
Member

ann0see commented Jul 31, 2023

No. I think we'd need to manage the .po file creation differently - they cause the conflicts.

@ignotus666
Copy link
Contributor

I'm all ears, but I don't see how - I think it's a problem inherent to how Weblate works.

@ann0see
Copy link
Member

ann0see commented Jul 31, 2023

Kind of. But there should be an easy way to fix conflicts- I can't connect to their repo. I believe the po file generation should be linked to the current state on Weblate. Maybe there's an API.

@ignotus666
Copy link
Contributor

Not sure it has anything to do with it, but you have to make sure you connect to the right branch on Weblate's fork - I was looking at next-release and was really puzzled as it seems to be based on one of my testing branches from a year ago. The right one is weblate-jamulus-1-index.

@ann0see
Copy link
Member

ann0see commented Aug 1, 2023

So is next-release wrong on jamulussoftware/jamuluswebsite???

Edit: ok. Only on the Weblate fork

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translation used by tools/create-translation-issues.sh
Projects
Status: Done
Development

No branches or pull requests

3 participants