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

Shields: Reword "device recognition" as "fingerprint" #4574

Merged
merged 1 commit into from
Feb 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions app/brave_generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
<message name="IDS_SETTINGS_BRAVE_SHIELDS_COOKIE_CONTROL_LABEL" desc="Default Brave cookies control setting label">
Cookies
</message>
<message name="IDS_SETTINGS_BRAVE_SHIELDS_FINGERPRINTING_CONTROL_LABEL" desc="Default Brave device recognition control setting label">
Device recognition
<message name="IDS_SETTINGS_BRAVE_SHIELDS_FINGERPRINTING_CONTROL_LABEL" desc="Default Brave fingerprinting control setting label">
Fingerprinting
</message>
<message name="IDS_SETTINGS_BRAVE_SHIELDS_HTTPS_EVERYWHERE_CONTROL_LABEL" desc="Default Brave upgrade connections to HTTPS control setting label">
Upgrade connections to HTTPS
Expand Down Expand Up @@ -375,13 +375,13 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
Block all cookies
</message>
<message name="IDS_SETTINGS_BLOCK_3RD_PARTY_FINGERPRINTING" desc="Select value">
Only block cross-site device recognition attempts
Only block cross-site fingerprinting attempts
</message>
<message name="IDS_SETTINGS_ALLOW_FINGERPRINTING" desc="Select value">
Allow all device recognition attempts
Allow all fingerprinting attempts
</message>
<message name="IDS_SETTINGS_BLOCK_FINGERPRINTING" desc="Select value">
Block all device recognition attempts
Block all fingerprinting attempts
</message>
<!-- WebRTC Policy Setting -->
<message name="IDS_SETTINGS_WEBRTC_POLICY_LABEL" desc="WebRTC policy setting label">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@
"description": "Message for the option in the cookies select field to allow all cookies"
},
"thirdPartyFingerprintingBlocked": {
"message": "Cross-site device recognition blocked",
"description": "Message for the option in the device recognition select field to block all 3rd party recognition attempts"
"message": "Cross-site fingerprinting blocked",
"description": "Message for the option in the fingerprinting select field to block all 3rd party recognition attempts"
},
"allFingerprintingBlocked": {
"message": "Device recognition attempts blocked",
"description": "Message for the option in the device recognition select field to block all device recognition attempts"
"message": "Fingerprinting attempts blocked",
"description": "Message for the option in the fingerprinting select field to block all fingerprinting attempts"
},
"allFingerprintingAllowed": {
"message": "All device recognition attempts allowed",
"description": "Message for the option in the device recognition select field to allow all device recognition attempts"
"message": "All fingerprinting attempts allowed",
"description": "Message for the option in the fingerprinting select field to allow all fingerprinting attempts"
},
"deviceRecognitionAttempts": {
"message": "Device recognition attempts",
"description": "Message for the device recognition attempts blocked panel"
"message": "Fingerprinting attempts",
"description": "Message for the fingerprinting attempts blocked panel"
},
"scriptsOnThisSite": {
"message": "Scripts on this site",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ const locale: { [key: string]: string } = {
thirdPartyCookiesBlocked: '3rd-party cookies blocked',
allCookiesBlocked: 'Cookies blocked',
allCookiesAllowed: 'All cookies allowed',
thirdPartyFingerprintingBlocked: '3rd-party device recognition blocked',
allFingerprintingBlocked: 'Device recognition blocked',
allFingerprintingAllowed: 'All device recognition allowed',
thirdPartyFingerprintingBlocked: '3rd-party fingerprinting blocked',
allFingerprintingBlocked: 'Fingerprinting blocked',
allFingerprintingAllowed: 'All fingerprinting allowed',
// static list
deviceRecognitionAttempts: 'Device recognition attempts',
deviceRecognitionAttempts: 'Fingerprinting attempts',
scriptsOnThisSite: 'Scripts on this site',
// scripts list
blockedScripts: 'Blocked scripts',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ storiesOf('Shields', module)
adsTrackersBlocked={number('3rd-party trackers blocked', 80) || 0}
httpsUpgrades={number('Connections upgraded to HTTPS', 0) || 0}
scriptsBlocked={number('Scripts blocked', 11) || 0}
fingerprintingBlocked={number('3rd-party device recognition blocked', 0) || 0}
fingerprintingBlocked={number('3rd-party fingerprinting blocked', 0) || 0}
fakeOnChangeShieldsEnabled={fakeOnChangeShieldsEnabled}
fakeOnChangeAdvancedView={fakeOnChangeAdvancedView}
fakeOnChangeReadOnlyView={fakeOnChangeReadOnlyView}
Expand Down