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

es: Spanish translation refresh #2232

Merged
merged 10 commits into from
Sep 12, 2024
Merged

es: Spanish translation refresh #2232

merged 10 commits into from
Sep 12, 2024

Conversation

carreter
Copy link
Contributor

Fixes #2120.

@mgeisler mgeisler changed the title Spanish (es) translation refresh en: Spanish translation refresh Jul 22, 2024
@henrif75 henrif75 changed the title en: Spanish translation refresh es: Spanish translation refresh Aug 6, 2024
@mgeisler
Copy link
Collaborator

Hey @carreter, this looks nice from a format point of view. I used

gh pr diff 2232 | bat -l patch

to skim through the diff. I don't know Spanish, so I cannot help with the actual content.

@mgeisler
Copy link
Collaborator

Since this looks fine from a structure point, I'm happy to merge this if you can resolve the conflicts.

You might need to hand-merge the out-of-date .po files, so take a look at the steps here: #1948 (comment). The recipe there basically treats each file as a large (msgid, msgstr) map and takes the union of the two files. That "trick" might come in handy here or in other PRs.

@henrif75
Copy link
Collaborator

We probably need to run dprint here

@henrif75
Copy link
Collaborator

Hi @carreter , were you able to run dprint fmt on the file? If you've done that, would you also convert this PR from draft to ready to review?

@carreter
Copy link
Contributor Author

@henrif75 Done. I'll mark it ready to review but note that many of the entries are still untranslated.

@carreter carreter marked this pull request as ready for review September 11, 2024 23:43
@deavid
Copy link
Collaborator

deavid commented Sep 12, 2024

I reviewed the Spanish text added on this PR and all seems correct to me.

@carreter
Copy link
Contributor Author

I'll open a stacked PR for further translation work. Still have ~200 entries to go!

@mgeisler
Copy link
Collaborator

I'll open a stacked PR for further translation work. Still have ~200 entries to go!

Yay, thanks for the amazing work!

Note that we squash-merge all PRs here — this makes it easier for new contributors since they can just pile on commit after commit in their PR without having to consider how the resulting history looks like. So it's fine to open a new PR with this as a base.

@mgeisler
Copy link
Collaborator

Oh, sorry about the unrelated format errors... This is #2165 and I still haven't gotten around to debug this in depth.

@carreter, I know you didn't have to sign the CLA, but the bot is no longer happy with the PR... can you sign it?

@mgeisler
Copy link
Collaborator

Oh, sorry about the unrelated format errors... This is #2165 and I still haven't gotten around to debug this in depth.

Actually, I didn't look carefully enough: could you revert the changes to the other translations from this PR? I guess there is a version mismatch somewhere between the msgcat you have and the one in GitHub's CI (if you look in dprint.json, you'll see that we simply run the .po files through msgcat -).

@carreter
Copy link
Contributor Author

Must be complaining because I left Google. I can only seem to get the CLA to be signed with my Gmail account, @mgeisler do you know if there's a way to use a non-gmail address?

@carreter
Copy link
Contributor Author

Actually, I didn't look carefully enough: could you revert the changes to the other translations from this PR? I guess there is a version mismatch somewhere between the msgcat you have and the one in GitHub's CI (if you look in dprint.json, you'll see that we simply run the .po files through msgcat -).

On it!

@carreter
Copy link
Contributor Author

CLA is working now and I have reverted the non-Spanish translation changes. @mgeisler let me know if anything else is needed!

@mgeisler
Copy link
Collaborator

Excellent, great that you got it working! I know from the past that people do need a Google/Gmail account, but it is possible to add non-Gmail addresses to the CLA bot.

@mgeisler mgeisler enabled auto-merge (squash) September 12, 2024 15:27
@mgeisler mgeisler merged commit c5f9e53 into google:main Sep 12, 2024
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Spanish (es): Catch-up with EN version
4 participants