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 chromium strings to change 'incognito' to 'private' #761

Closed
wants to merge 1 commit into from

Conversation

petemill
Copy link
Member

@petemill petemill commented Oct 29, 2018

This is the auto-generated output as a result from brave/brave-browser#1890
Any desired changes to this output will have to result in a change to the re-basing script, and a re-generation of these files.

Re-land #683
Fix brave/brave-browser#738

Note that this should probably only land on a release branch where the updated strings will be sent for translation updates. This is because language translations are hashed against the source English string, and therefore will be invalidated by these updates.

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

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

This is the auto-generated output as a result from brave/brave-browser#1890
Any desired changes to this output will have to result in a change to the re-basing script, and a re-generation of these files.

Re-land #683
Fix brave/brave-browser#738
@petemill petemill self-assigned this Oct 29, 2018
Copy link
Member

@bbondy bbondy left a comment

Choose a reason for hiding this comment

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

We can't change generated grd and grdp files directly.

@petemill
Copy link
Member Author

petemill commented Nov 5, 2018

@bbondy this is just the generated output from brave/brave-browser#1890 which is still awaiting review

@bbondy
Copy link
Member

bbondy commented Nov 5, 2018

Gotcha, why not the same PR?

@petemill
Copy link
Member Author

petemill commented Nov 5, 2018

@bbondy different repo

Copy link
Member

@bbondy bbondy left a comment

Choose a reason for hiding this comment

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

Approved but pls regenerate the files again.

@kjozwiak
Copy link
Member

kjozwiak commented Nov 13, 2018

Clearing the uplift-request/0.57.x-Beta flag. As per process, please re-submit for approval once this has landed in master and requires uplift into 0.57.x.

Could we get this merged into master ASAP and get another uplift approval as @bbondy is planning on ordering translations in the next few days.

@bbondy
Copy link
Member

bbondy commented Nov 15, 2018

Uplifted since this is a strings update.
master: d76c724
0.58.x: 6dbeae2
0.57.x: 6d341e2

@bbondy bbondy closed this Nov 15, 2018
@NejcZdovc NejcZdovc deleted the incognito-private-strings branch November 15, 2018 05:07
@bbondy bbondy added this to the 0.57.x - Release milestone Jan 14, 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.

Rename Incognito to Private
5 participants