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

Fixes missing grdp files. #3990

Merged
merged 3 commits into from
Nov 20, 2019
Merged

Fixes missing grdp files. #3990

merged 3 commits into from
Nov 20, 2019

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Nov 13, 2019

Fixes brave/brave-browser#6907
Related PR: brave/brave-browser#6909

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@mkarolin mkarolin added this to the 1.3.x - Nightly milestone Nov 13, 2019
@mkarolin mkarolin self-assigned this Nov 13, 2019
@mkarolin mkarolin changed the title WIP: Fixes missing grdp files. Fixes missing grdp files. Nov 14, 2019
@mkarolin
Copy link
Collaborator Author

Only known, unrelated browser test failure in CI.

Fixes brave/brave-browser#6907

There is no need to exclude os_settings_strings.grdp and
xr_consent_ui_strings.grdp.

media_router_resources.grdp has been removed upstream.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/edcf55b10dfe41c3ffa18bfbca8f07e62532ef74

commit edcf55b10dfe41c3ffa18bfbca8f07e62532ef74
Author: Takumi Fujimoto <takumif@chromium.org>
Date:   Tue Jul 9 16:36:20 2019 +0000

    Delete Media Router WebUI dialog resource files

    Delete JS/HTML/CSS files for chrome://media-router and its tests.

    We do not remove files related to chrome://media-router-internals
    because that is still in use.

    Bug: 900246
Copy link
Member

@yrliou yrliou left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

++

@mkarolin mkarolin added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 and removed CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Nov 19, 2019
@mkarolin mkarolin merged commit 644aa96 into master Nov 20, 2019
@mkarolin mkarolin deleted the maxk-fix-missing-grdp branch November 20, 2019 03:40
mkarolin added a commit that referenced this pull request Dec 3, 2019
mkarolin added a commit that referenced this pull request Dec 3, 2019
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.

Fix pushing strings to Transifex
4 participants