Merge pull request #5421 from brave/string-n-menu-edits

refined string text for multiple items including change of Bravery to Shields
brave · Nov 8, 2016 · c82775b · c82775b
2 parents 94047eb + f0f59cd
commit c82775b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -512,8 +512,8 @@ const createMenu = () => {
     {
       label: locale.translation('bravery'),
       submenu: [
-        CommonMenu.braveryGlobalMenuItem(),
         CommonMenu.braverySiteMenuItem(),
+        CommonMenu.separatorMenuItem,
         CommonMenu.braveryPaymentsMenuItem()
       ]
     },
@@ -531,12 +531,10 @@ const createMenu = () => {
       submenu: [
         CommonMenu.aboutBraveMenuItem(),
         CommonMenu.separatorMenuItem,
-        CommonMenu.checkForUpdateMenuItem(),
-        CommonMenu.separatorMenuItem,
-        CommonMenu.importBrowserDataMenuItem(),
-        CommonMenu.separatorMenuItem,
         CommonMenu.preferencesMenuItem(),
         CommonMenu.separatorMenuItem,
+        CommonMenu.importBrowserDataMenuItem(),
+        CommonMenu.checkForUpdateMenuItem(),
         CommonMenu.submitFeedbackMenuItem(),
         CommonMenu.separatorMenuItem,
         {

diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
@@ -55,7 +55,7 @@ reloadButton.title=Reload page
 homeButton.title=Open Homepage
 stopButton.title=Stop loading
 noScriptButton.title=Allow scripts
-braveMenu.title=Open Bravery Panel
+braveMenu.title=Open Brave Shields Panel
 muteTab=Mute tab
 unmuteTab=Unmute tab
 disableProtectionForSite=Disable tracking protection
@@ -142,7 +142,7 @@ bookmarksToolbar=Bookmarks Toolbar
 otherBookmarks=Other Bookmarks
 urlbar.placeholder=Enter a URL or search term
 
-braveryPanelTitle=Brave site shield settings for
+braveryPanelTitle=Site shield settings for
 shields=Shields
 shieldsDown=Down
 shieldsUp=Up

diff --git a/app/extensions/brave/locales/en-US/bravery.properties b/app/extensions/brave/locales/en-US/bravery.properties
@@ -3,6 +3,7 @@ allowAdsAndTracking=Allow Ads and Tracking
 block3rdPartyCookie=Block 3rd Party Cookies
 httpsEverywhere=HTTPS Everywhere
 noScript=Block Scripts
+noScriptPref=Block Scripts (will break many sites)
 safeBrowsing=Block Phishing / Malware
 blockPopups=Block Popups
 fingerprintingProtection=Fingerprinting Protection
@@ -23,4 +24,4 @@ fingerprintingBlocked[other]=Fingerprinting Methods Blocked
 httpReroutes={[plural(httpsUpgradeCount)]}
 httpReroutes[one]=HTTPS Upgrade
 httpReroutes[other]=HTTPS Upgrades
-editBraveryGlobalSettings=Edit Bravery Global Settings…
+editBraveryGlobalSettings=Edit default shield  settings…
diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
@@ -90,9 +90,9 @@ importBrowserData=Import Browser Data…
 reportAnIssue=Report an Issue
 submitFeedback=Submit Feedback…
 bookmarksToolbar=Bookmarks Toolbar
-bravery=Bravery
-braverySite=Bravery Site Settings…
-braveryGlobal=Bravery Global Settings…
+bravery=Shields
+braverySite=Site Shield Settings…
+braveryGlobal=Bravery global settings…
 braveryPayments=Brave Payments…
 braveryStartUsingPayments=Start using Brave Payments…
 addBookmark=Add Bookmark…

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -122,7 +122,7 @@ showOpenedTabMatches=Show tab matches
 offerSearchSuggestions=Autocomplete search term as you type
 doNotTrackTitle=Do Not Track
 doNotTrack=Send a 'Do Not Track' header with browsing requests (requires browser restart)
-blockCanvasFingerprinting=Fingerprinting Protection (may break some websites)
+blockCanvasFingerprinting=Fingerprinting Protection (may break some sites)
 advancedSettings=Advanced Settings...
 advancedSettingsTitle=Advanced Settings for Brave Payments
 ledgerRecoveryTitle=Recover your Brave wallet
@@ -139,7 +139,7 @@ recover=Recover
 printKeys=Print keys
 saveRecoveryFile=Save recovery file...
 advancedPrivacySettings=Advanced Privacy Settings:
-braveryDefaults=Bravery Defaults
+braveryDefaults=Default Shields: All Sites
 blockAttackSites=Block reported attack sites (not available yet)
 passwordManager=Password Manager
 searchSettings=Search Settings

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -1450,7 +1450,7 @@ class ShieldsTab extends ImmutableComponent {
         </SettingItem>
         <SettingCheckbox checked={this.props.braveryDefaults.get('httpsEverywhere')} dataL10nId='httpsEverywhere' onChange={this.onToggleHTTPSE} />
         <SettingCheckbox checked={this.props.braveryDefaults.get('safeBrowsing')} dataL10nId='safeBrowsing' onChange={this.onToggleSafeBrowsing} />
-        <SettingCheckbox checked={this.props.braveryDefaults.get('noScript')} dataL10nId='noScript' onChange={this.onToggleNoScript} />
+        <SettingCheckbox checked={this.props.braveryDefaults.get('noScript')} dataL10nId='noScriptPref' onChange={this.onToggleNoScript} />
         <SettingCheckbox dataL10nId='blockCanvasFingerprinting' prefKey={settings.BLOCK_CANVAS_FINGERPRINTING} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         <SettingItem>
           <Button l10nId='manageAdblockSettings' className='primaryButton manageAdblockSettings'

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -683,7 +683,7 @@ function hamburgerTemplateInit (location, e) {
     }, {
       label: locale.translation('bravery'),
       submenu: [
-        CommonMenu.braveryGlobalMenuItem(),
+//        CommonMenu.braveryGlobalMenuItem(),
         CommonMenu.braverySiteMenuItem(),
         CommonMenu.braveryPaymentsMenuItem()
       ]