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

Rename 'incognito' to 'private' when rebasing chromium strings #1890

Closed
wants to merge 1 commit into from

Conversation

petemill
Copy link
Member

Addresses #738.

Should probably not be merged until brave-core counterpart is approved, since any changes desired from that output would warrant changes in this script.

Also makes the IO async - apologies if that's annoying.

@petemill petemill self-assigned this Oct 29, 2018
@petemill petemill requested a review from bbondy October 29, 2018 22:50
petemill added a commit to brave/brave-core that referenced this pull request 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
@bbondy
Copy link
Member

bbondy commented Nov 15, 2018

master: ff19704
0.58.x: 2198aa8
0.57.x: ea2bcf0

@bbondy
Copy link
Member

bbondy commented Nov 15, 2018

uplifted since it's only used for strings, and strings update will be applied.

bbondy pushed a commit to brave/brave-core that referenced this pull request Nov 15, 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
bbondy pushed a commit to brave/brave-core that referenced this pull request Nov 15, 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
bbondy pushed a commit to brave/brave-core that referenced this pull request Nov 15, 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
@NejcZdovc NejcZdovc deleted the incognito-private-strings branch November 15, 2018 05:31
@bbondy bbondy removed the 0.57.x label 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.

4 participants