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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/browser/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ const createMenu = () => {
{
label: locale.translation('bravery'),
submenu: [
CommonMenu.braveryGlobalMenuItem(),
CommonMenu.braverySiteMenuItem(),
CommonMenu.separatorMenuItem,
CommonMenu.braveryPaymentsMenuItem()
]
},
Expand All @@ -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,
{
Expand Down
4 changes: 2 additions & 2 deletions app/extensions/brave/locales/en-US/app.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/extensions/brave/locales/en-US/bravery.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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…
6 changes: 3 additions & 3 deletions app/extensions/brave/locales/en-US/menu.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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…
Expand Down
4 changes: 2 additions & 2 deletions app/extensions/brave/locales/en-US/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion js/contextMenus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

CommonMenu.braverySiteMenuItem(),
CommonMenu.braveryPaymentsMenuItem()
]
Expand Down