Skip to content

Commit

Permalink
Replace requires browser restart with * (brave#7343)
Browse files Browse the repository at this point in the history
  • Loading branch information
srirambv authored and cezaraugusto committed Mar 4, 2017
1 parent 37bd986 commit 39ffa5f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
17 changes: 9 additions & 8 deletions app/extensions/brave/locales/en-US/preferences.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
preferences=Preferences
preferences=Preferences
settings=Settings
general=General
search=Search
Expand Down Expand Up @@ -186,7 +186,7 @@ showBookmarkMatches=Show bookmark matches
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)
doNotTrack=Send a 'Do Not Track' header with browsing requests *
fullscreenContent=Full Screen Content
blockCanvasFingerprinting=Fingerprinting Protection (may break some sites)
advancedSettings=Advanced Settings...
Expand Down Expand Up @@ -223,7 +223,7 @@ dashlane=Dashlane® (requires application)
lastPass=LastPass®
enpass=Enpass® (requires application)
doNotManageMyPasswords=Don't manage my passwords
usePDFJS=Enable HTML5 PDF reader (requires browser restart)
usePDFJS=Enable HTML5 PDF reader *
enableFlash=Enable Adobe Flash support
widevineSection=Google Widevine Support
enableWidevine=Enable Google Widevine support
Expand All @@ -233,7 +233,7 @@ flashTroubleshooting=Flash not working? Try the troubleshooting tips on our
managePasswords=Manage passwords…
sitePermissions=Saved Site Permissions
sitePermissionsExceptions=Saved Site Exceptions
selectedLanguage=Language (requires browser restart)
selectedLanguage=Language *
bookmarkToolbarSettings=Bookmarks Bar
bookmarkToolbar=Always show the bookmarks bar
bookmarkToolbarShowFavicon=Favicons
Expand All @@ -243,8 +243,8 @@ extensions=Extensions
enablePocket=Enable Pocket
moreExtensionsComingSoon=More extensions coming soon…
viewInstalledExtensions=View Installed Extensions…
useHardwareAcceleration=Use hardware acceleration when available (requires browser restart)
useSmoothScroll=Enable smooth scrolling (requires browser restart)
useHardwareAcceleration=Use hardware acceleration when available *
useSmoothScroll=Enable smooth scrolling *
defaultZoomLevel=Default zoom level
en-US=English (U.S.)
nl-NL=Dutch (Netherlands)
Expand Down Expand Up @@ -331,7 +331,7 @@ enableAutofill=Enable Autofill
importBrowserData=Import Browser Data
importNow=Import now…
clearAll=Clear all
sendCrashReports=Send anonymous crash reports to Brave (requires browser restart)
sendCrashReports=Send anonymous crash reports to Brave *
sendUsageStatistics=Automatically send usage statistics to Brave
bookmarksBarTextOnly=Text only
bookmarksBarTextAndFavicon=Text and Favicons
Expand All @@ -340,6 +340,7 @@ defaultBrowser=Brave is your default browser.
notDefaultBrowser=Brave is not your default browser.
setAsDefault=Set as default…
checkDefaultOnStartup=Always check on startup
useTorrentViewer=Enable Torrent Viewer (requires browser restart)
useTorrentViewer=Enable Torrent Viewer *
dashboardSettingsTitle=Dashboard
dashboardShowImages=Show images
requiresRestart=* Requires browser restart
3 changes: 3 additions & 0 deletions js/about/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ class GeneralTab extends ImmutableComponent {
settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
</SettingItem>
</SettingsList>
<div data-l10n-id='requiresRestart' className='requiresRestart' />
</SettingsList>
}
}
Expand Down Expand Up @@ -938,6 +939,7 @@ class SecurityTab extends ImmutableComponent {
<SettingCheckbox dataL10nId='doNotTrack' prefKey={settings.DO_NOT_TRACK} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
</SettingsList>
<SitePermissionsPage siteSettings={this.props.siteSettings} names={permissionNames} />
<div data-l10n-id='requiresRestart' className='requiresRestart' />
</div>
}
}
Expand All @@ -963,6 +965,7 @@ class AdvancedTab extends ImmutableComponent {
}, true)} />
<div data-l10n-id='moreExtensionsComingSoon' className='moreExtensionsComingSoon' />
</SettingsList>
<div data-l10n-id='requiresRestart' className='requiresRestart' />
</div>
}
}
Expand Down
5 changes: 5 additions & 0 deletions less/about/preferences.less
Original file line number Diff line number Diff line change
Expand Up @@ -1339,3 +1339,8 @@ table.sortableTable {
#syncQR {
margin: 1em;
}

.requiresRestart {
font-style: italic;
margin-bottom: 2em;
}

0 comments on commit 39ffa5f

Please sign in to comment.