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

Pulled remaining JA l10n for 1.20.x. #7983

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Pulled remaining JA l10n for 1.20.x. #7983

merged 1 commit into from
Feb 17, 2021

Conversation

mkarolin
Copy link
Collaborator

Fixes brave/brave-browser#14220

Submitter Checklist:

  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)
  • Requested a security/privacy review as needed

Reviewer Checklist:

  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@mkarolin mkarolin requested a review from deeppandya February 17, 2021 15:25
@mkarolin mkarolin self-assigned this Feb 17, 2021
@mkarolin mkarolin added CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows labels Feb 17, 2021
Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

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

LGTM

@mkarolin
Copy link
Collaborator Author

CI passed on Android and 1 Desktop platform (Linux) - no need for other platforms.

@mkarolin mkarolin merged commit 55cf299 into 1.21.x Feb 17, 2021
@mkarolin mkarolin deleted the maxk-more-ja-l10n branch February 17, 2021 22:07
@mkarolin mkarolin added this to the 1.21.x - Beta milestone Feb 17, 2021
justnom pushed a commit that referenced this pull request Feb 17, 2021
Pulled remaining JA l10n for 1.20.x.
bsclifton added a commit that referenced this pull request Feb 26, 2021
This reverts commit 55cf299, reversing
changes made to f25d284.
@kjozwiak
Copy link
Member

Moving this into 1.22.x as the BAP work is being reverted via #8088. Once we have more information next week, we'll re-revert #8088 and move everything back into 1.21.x and release 1.21.x - Release #2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants