Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

refined string text for multiple items including change of Bravery to Shields #5421

Merged
merged 1 commit into from
Nov 8, 2016

Conversation

bradleyrichter
Copy link
Contributor

cc @bbondy

@bsclifton
Copy link
Member

bsclifton commented Nov 8, 2016

There were conflicts; I rebased and resolved them. So changes look like:

  • remove global site settings from Bravery menu
  • move import/check for update down a few positions in mac Brave menu
  • Changing text to say "Shield settings" rather than "Bravery settings"
  • Add "(will break many sites)" warning to no script

Changes LGTM 😄 Assigning to @bbondy per Brad's comment above

@bradleyrichter
Copy link
Contributor Author

thanks @bsclifton

@bbondy bbondy added this to the 0.12.9dev milestone Nov 8, 2016
@@ -683,7 +683,7 @@ function hamburgerTemplateInit (location, e) {
}, {
label: locale.translation('bravery'),
submenu: [
CommonMenu.braveryGlobalMenuItem(),
// CommonMenu.braveryGlobalMenuItem(),
Copy link
Member

Choose a reason for hiding this comment

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

nit: Comment should be aligned with the lines on the same indent level
nit2: You don't ever really need to comment out code since all code is recoverable with git history.

@bbondy
Copy link
Member

bbondy commented Nov 8, 2016

++ merging.

@bbondy bbondy merged commit c82775b into master Nov 8, 2016
@bradleyrichter
Copy link
Contributor Author

Noted. Ty.

On Nov 8, 2016, at 6:04 AM, Brian R. Bondy notifications@github.com wrote:

@bbondy commented on this pull request.

In js/contextMenus.js:

@@ -683,7 +683,7 @@ function hamburgerTemplateInit (location, e) {
}, {
label: locale.translation('bravery'),
submenu: [

  •    CommonMenu.braveryGlobalMenuItem(),
    
    +// CommonMenu.braveryGlobalMenuItem(),
    nit: Comment should be aligned with the lines on the same indent level
    nit2: You don't ever really need to comment out code since all code is recoverable with git history.


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or mute the thread.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants