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 Basque localization for 1.97.0 #7580

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

REALSOULMAN
Copy link
Contributor

Added some missing translations

@surfdude29
Copy link
Contributor

surfdude29 commented Jan 25, 2025

This PR seems to include changes that have already been merged in (that's why it says This branch has conflicts that must be resolved).

I think you just need the final commit with the new/updated translations: 21c805f

@REALSOULMAN
Copy link
Contributor Author

This PR seems to include changes that have already been merged in (that's why it says This branch has conflicts that must be resolved).

I think you just need the final commit with the new/updated translations: 21c805f

Sorry, I don't know what I did wrong and what can I do now to put this last commit to merge.
Could you explain the steps to correct it?

If there is no time to do this updates, close this PR and I can try to make new one for the next app update.

@surfdude29
Copy link
Contributor

surfdude29 commented Jan 25, 2025

Not to worry, we'll get it sorted! :)

Sorry for any confusion my message caused.

What I was meaning to convey is that the only file you need in this PR is the updated messages.po with the revised translations.

So I would suggest creating a new branch that's synced to bluesky-social:main, and then just update the messages.po and create a new PR from that.

Or if you prefer, leave this PR open and I'm sure @pfrazee will be able to sort things out :)

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