8000 chore: rollup of updates from TranslateWiki by maribethb · Pull Request #8162 · google/blockly · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

chore: rollup of updates from TranslateWiki #8162

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
May 20, 2024
Merged

chore: rollup of updates from TranslateWiki #8162

merged 2 commits into from
May 20, 2024

Conversation

maribethb
Copy link
Contributor

The basics

The details

Merges in updates from the translatewiki branch, with some changes. Our procedure for updating translations is to check out develop, then "git restore" the msg files from the translatewiki branch. Unfortunately, this does not result in an actual merge. If there were changes to anything in msg then they will just be overwritten with the version in master. There were several valid changes in the develop branch this quarter, some from adding new messages, and some from a fix neil made that pretty-prints some generated files. I checked each file and this PR is the result of using all the files from translatewiki, then reverting (therefore using the version in develop) the following files:

  • constants.json (pretty printed)
  • en.json (new string added)
  • qqq.json (new string added)
  • synonyms.json (pretty printed)

@maribethb maribethb requested a review from a team as a code owner May 20, 2024 17:31
@maribethb maribethb requested review from NeilFraser and cpcallen May 20, 2024 17:31
@github-actions github-actions bot added the PR: chore General chores (dependencies, typos, etc) label May 20, 2024
NeilFraser
NeilFraser approved these changes May 20, 2024
View reviewed changes
Copy link
Contributor
@NeilFraser NeilFraser left a comment

Choose a reason for hiding this comment

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

All these changes look good.

@cpcallen
chore: Roll up additional translatewiki changes
9cee11a 
Not sure how these were omitted from PR originally.
@maribethb maribethb merged commit b4414c3 into google:develop May 20, 2024
6 checks passed
@rachel-fenichel rachel-fenichel mentioned this pull request May 15, 2025
Open
1 task
@maribethb maribethb mentioned this pull request May 15, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeilFraser NeilFraser NeilFraser approved these changes

@cpcallen cpcallen cpcallen approved these changes

Assignees

@NeilFraser NeilFraser

@cpcallen cpcallen

Labels
PR: chore General chores (dependencies, typos, etc)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@maribethb @NeilFraser @cpcallen
0