From 7316cb84d410dfe5a27906e8cc8c05b829118ff7 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy <41635752+mkarolin@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:00:50 -0500 Subject: [PATCH] Fixes aggressive replacements of person/people with profile(s) (uplift to 1.74.x). (#26644) Merge pull request #26540 from brave/maxk-fix-person-people-replacements Fixes aggressive replacements of person/people with profile(s). --- app/brave_strings.grd | 10 +++---- app/generated_resources.grd | 6 ++-- app/generated_resources_override.grd | 6 ---- app/nearby_share_strings.grdp | 6 ++-- app/os_settings_strings.grdp | 4 +-- app/os_settings_strings_override.grdp | 6 ---- app/settings_brave_strings.grdp | 12 ++++---- app/settings_brave_strings_override.grdp | 4 --- app/settings_strings.grdp | 6 ++-- app/settings_strings_override.grdp | 9 ------ .../strings/android_chrome_strings.grd | 4 +-- .../android_chrome_strings_override.grd | 7 ----- components/payments_strings.grdp | 12 ++++---- .../privacy_sandbox_chrome_strings.grdp | 28 +++++++++---------- .../security_interstitials_strings.grdp | 2 +- components/supervised_user_strings.grdp | 4 +-- script/lib/l10n/grd_string_replacements.py | 25 +++++++++++++++++ 17 files changed, 72 insertions(+), 79 deletions(-) diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 851f2f7de566..1d87329a1c6c 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -2096,19 +2096,19 @@ Permissions you've already given to websites and apps may apply to this account. Your interests as estimated by Brave - + <b>What data is used:</b> Your browsing history, a record of sites you’ve visited using Brave on this device. - + <b>How we use this data:</b> Brave can estimate your interests. Later, a site you visit can ask Brave to see your interests in order to personalize the ads you see. - + <b>How you can manage your data:</b> To protect your privacy, we auto-delete your interests that are older than 4 weeks. As you keep browsing, an interest might appear on the list again. Or you can remove interests you don’t want Brave to consider. - + <b>What data is used:</b> Your browsing history, a record of sites you’ve visited using Brave on this device. - + <b>How we use this data:</b> Sites can store information with Brave about your interests. For example, if you visit a site to buy shoes for a marathon, the site might define your interest as running marathons. Later, if you visit a different site to register for a race, that site can show you an ad for running shoes based on your interests. diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 03db76d2cc68..a00d1aa47adb 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -3730,10 +3730,10 @@ are declared in tools/grit/grit_rule.gni. You usually block notifications. To let this site notify you, click here. - Most profiles block notifications from this site + Most people block notifications from this site - Most profiles block sharing precise location for this site + Most people block sharing precise location for this site This site may be trying to trick you into allowing intrusive notifications @@ -17260,7 +17260,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Sites you visit that define your interests - + <b>How you can manage your data:</b> To protect your privacy, we auto-delete sites from the list that are older than 4 weeks. A site you visit again might appear on the list again. Or you can remove a site if you don’t want that site to ever define interests for you. diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index 67f509ca44d2..262d9de96879 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -401,12 +401,6 @@ are declared in tools/grit/grit_rule.gni. - - Most profiles block notifications from this site - - - Most profiles block sharing precise location for this site - diff --git a/app/nearby_share_strings.grdp b/app/nearby_share_strings.grdp index 698a9661a64f..278842b77e92 100644 --- a/app/nearby_share_strings.grdp +++ b/app/nearby_share_strings.grdp @@ -405,13 +405,13 @@ Decline - Set up Nearby Share to receive and send files with profiles around you + Set up Nearby Share to receive and send files with people around you - Set up $1Nearby Share to receive and send files with profiles around you + Set up $1Nearby Share to receive and send files with people around you - To receive and accept files with profiles around you, become visible + To receive and accept files with people around you, become visible Device nearby is sharing diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 865e3bd17dd0..6ca147bd95a8 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -7148,7 +7148,7 @@ Press & hold keyboard keys to see accent marks and special characters. This Use secure connections to look up sites - Make it harder for profiles with access to your internet traffic to see which sites you visit. $1ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System). + Make it harder for people with access to your internet traffic to see which sites you visit. $1ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System). Turn off URL encryption? @@ -7169,7 +7169,7 @@ Press & hold keyboard keys to see accent marks and special characters. This Secure connections might not always be available when using the network default. Consider selecting a different provider to ensure you're always using a secure connection. - Make it harder for profiles with access to your internet traffic to see which sites you visit. $1ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System). Secure connections are not used for some domains configured by your administrator. + Make it harder for people with access to your internet traffic to see which sites you visit. $1ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System). Secure connections are not used for some domains configured by your administrator. Use a secure connection to look up a site’s IP address in the DNS (Domain Name System). This uses a managed service provider at $1https://dns.example.net/dns-query{?dns}. Secure connections are not used for some domains configured by your administrator. diff --git a/app/os_settings_strings_override.grdp b/app/os_settings_strings_override.grdp index 7957e94c8963..a52d6d203981 100644 --- a/app/os_settings_strings_override.grdp +++ b/app/os_settings_strings_override.grdp @@ -23,11 +23,5 @@ Your $1Chromebook uses a built-in sensor to detect profiles in front of your device. All data is processed on your device immediately and then deleted. Sensor data is never sent to Brave. <a>Learn more</a> - - Make it harder for profiles with access to your internet traffic to see which sites you visit. $1ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System). - - - Make it harder for profiles with access to your internet traffic to see which sites you visit. $1ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System). Secure connections are not used for some domains configured by your administrator. - diff --git a/app/settings_brave_strings.grdp b/app/settings_brave_strings.grdp index f3035909e92c..97e36d7fbe3e 100644 --- a/app/settings_brave_strings.grdp +++ b/app/settings_brave_strings.grdp @@ -216,19 +216,19 @@ Your interests as estimated by Brave - + Your browsing history, a record of sites you've visited using Brave on this device. - + Brave can estimate your interests. Later, a site you visit can ask Brave to see your interests in order to personalize the ads you see. - + To protect your privacy, we auto-delete your interests that are older than 4 weeks. As you keep browsing, an interest might appear on the list again. Or you can remove interests you don't want Brave to consider. - + Your browsing history, a record of sites you've visited using Brave on this device. - + Sites can store information with Brave about your interests. For example, if you visit a site to buy shoes for a marathon, the site might define your interest as running marathons. Later, if you visit a different site to register for a race, that site can show you an ad for running shoes based on your interests. @@ -299,7 +299,7 @@ Learn more about <a href="#" id="enhancedProtectionLearnMoreLink" on-click="onEnhancedProtectionLearnMoreClick_">how Brave keeps your data private</a></a> - Make it harder for profiles with access to your internet traffic to see which sites you visit. Brave uses a secure connection to look up a site's IP address in the DNS (Domain Name System). + Make it harder for people with access to your internet traffic to see which sites you visit. Brave uses a secure connection to look up a site's IP address in the DNS (Domain Name System). diff --git a/app/settings_brave_strings_override.grdp b/app/settings_brave_strings_override.grdp index da4461f73309..6d476d9f08f5 100644 --- a/app/settings_brave_strings_override.grdp +++ b/app/settings_brave_strings_override.grdp @@ -26,10 +26,6 @@ - - Make it harder for profiles with access to your internet traffic to see which sites you visit. Brave uses a secure connection to look up a site's IP address in the DNS (Domain Name System). - - diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 639b63a36483..bcbccd07fa9d 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -1504,16 +1504,16 @@ Sites can't help verify you're not a bot - Sites you visit can verify that you're a real profile and not a bot + Sites you visit can verify that you're a real person and not a bot A site you visit can save a small amount of info with Brave, mainly to validate you're not a bot - As you keep browsing, sites can check with Brave and verify with a previous site you've visited that you're likely a real profile + As you keep browsing, sites can check with Brave and verify with a previous site you've visited that you're likely a real person - Browsing is faster because a site is less likely to ask you to verify you're a real profile + Browsing is faster because a site is less likely to ask you to verify you're a real person This setting works without identifying you or allowing sites to see your browsing history, though sites can share a small amount of info as part of the verification diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index 180cd51e8421..9be6c376e460 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -96,15 +96,6 @@ - - Sites you visit can verify that you're a real profile and not a bot - - - As you keep browsing, sites can check with Brave and verify with a previous site you've visited that you're likely a real profile - - - Browsing is faster because a site is less likely to ask you to verify you're a real profile - Block third-party cookies in Private diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 9eeb0315e07d..20175bc2d425 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -3632,7 +3632,7 @@ To change this setting, BEGIN_LINKdelete the Brave da When on - Help make Brave better for profiles who use it the way you do + Help make Brave better for people who use it the way you do Things to consider @@ -5985,7 +5985,7 @@ To change this setting, BEGIN_LINKdelete the Brave da - To share with profiles nearby, let them scan this QR Code + To share with people nearby, let them scan this QR Code diff --git a/browser/ui/android/strings/android_chrome_strings_override.grd b/browser/ui/android/strings/android_chrome_strings_override.grd index c0a02f7333ae..99a041d19c6a 100644 --- a/browser/ui/android/strings/android_chrome_strings_override.grd +++ b/browser/ui/android/strings/android_chrome_strings_override.grd @@ -186,9 +186,6 @@ CHAR_LIMIT guidelines: Private tabs will be locked when you leave Brave - - Help make Brave better for profiles who use it the way you do - New Private tab @@ -278,10 +275,6 @@ CHAR_LIMIT guidelines: Private is not available on this device - - To share with profiles nearby, let them scan this QR Code - - You’ll be able to easily manage media controls, Private sessions, downloads and more diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index db2525deb21a..ae521cde27a3 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -32,7 +32,7 @@ Add phone number - + Add name @@ -41,7 +41,7 @@ Add email - + Add name @@ -83,7 +83,7 @@ Add Phone Number - + Add Name @@ -92,7 +92,7 @@ Add Email - + Add Name @@ -324,13 +324,13 @@ Phone number required - + Name required Email required - + Name required diff --git a/components/privacy_sandbox_chrome_strings.grdp b/components/privacy_sandbox_chrome_strings.grdp index 0ef26204da7d..1937872ea06a 100644 --- a/components/privacy_sandbox_chrome_strings.grdp +++ b/components/privacy_sandbox_chrome_strings.grdp @@ -58,7 +58,7 @@ We’re launching new ways to limit what sites can learn about you when they show you personalized ads, for example: - + Site-suggested ads help protect your browsing history and identity while enabling sites to show you relevant ads. Based on your activity, a site you visited can suggest related ads as you continue browsing. You can see a list of these sites and block the ones you don’t want in settings. @@ -447,7 +447,7 @@ Soundtracks - + Talk Radio @@ -456,7 +456,7 @@ Reggae & Caribbean Music - + Online Image Galleries @@ -483,7 +483,7 @@ TV Familly-oriented Shows - + TV Reality Shows @@ -585,7 +585,7 @@ Used Vehicles - + Vehicle Shows @@ -717,7 +717,7 @@ Computer Peripherals - + Consumer Electronics @@ -783,7 +783,7 @@ Accounting & Auditing - + Tax Preparation & Planning @@ -816,7 +816,7 @@ Home Insurance - + Life Insurance @@ -1083,7 +1083,7 @@ Online Communities - + Dating & Personals @@ -1092,7 +1092,7 @@ Social Networks - + People & Society @@ -1113,7 +1113,7 @@ Babies & Toddlers - + Child Internet Safety @@ -1248,7 +1248,7 @@ Bowling - + Boxing @@ -1371,7 +1371,7 @@ Regional Parks & Gardens - + Theme Parks @@ -1432,7 +1432,7 @@ TV Game Shows - + TV Talk Shows diff --git a/components/security_interstitials_strings.grdp b/components/security_interstitials_strings.grdp index a30d8b36da4c..531a33998df9 100644 --- a/components/security_interstitials_strings.grdp +++ b/components/security_interstitials_strings.grdp @@ -61,7 +61,7 @@ "$1Misconfigured Antivirus" isn’t configured correctly. Uninstalling "$1Misconfigured Antivirus" usually fixes the problem. $2Further explanation goes here. - + Applications that can cause this error include antivirus, firewall, and web-filtering or proxy software. diff --git a/components/supervised_user_strings.grdp b/components/supervised_user_strings.grdp index 7fccf0d50636..1484ce8c0140 100644 --- a/components/supervised_user_strings.grdp +++ b/components/supervised_user_strings.grdp @@ -21,10 +21,10 @@ OK - Ask in profile + Ask in person - Ask in profile instead + Ask in person instead Ask in a message diff --git a/script/lib/l10n/grd_string_replacements.py b/script/lib/l10n/grd_string_replacements.py index ac202e9c8ead..be067a09afd5 100755 --- a/script/lib/l10n/grd_string_replacements.py +++ b/script/lib/l10n/grd_string_replacements.py @@ -70,6 +70,31 @@ (r'powered by Brave AI', r'powered by Google AI'), (r'Invite profiles', r'Invite people'), (r'Profiles & Society', r'People & Society'), + (r'help profiles', r'help people'), + (r'Most profiles', r'Most people'), + (r'files with profiles', r'files with people'), + (r'harder for profiles', r'harder for people'), + (r'better for profiles', r'better for people'), + (r'share with profiles', r'share with people'), + (r'free to profiles', r'free to people'), + (r'programs in which profiles', r'programs in which people'), + (r'famous profiles', r'famous people'), + (r'ordinary profiles', r'ordinary people'), + (r'manufacturers and other profiles', r'manufacturers and other people'), + (r'use by everyday profiles', r'use by everyday people'), + (r'prepare taxes for profiles', r'prepare taxes for people'), + (r'scientific study of profiles', r'scientific study of people'), + (r'children and young profiles', r'children and young people'), + (r'sport in which two profiles', r'sport in which two people'), + (r'group of profiles', r'group of people'), + (r'keeps unwanted profiles', r'keeps unwanted people'), + (r'a real profile', r'a real person'), + (r'The profile who set up', r'The person who set up'), + (r'name could be a profile', r'name could be a person'), + (r'name identifies the profile', r'name identifies the person'), + (r'the insured profile', r'the insured person'), + (r'programs where one profile', r'programs where one person'), + (r'Ask in profile', r'Ask in person'), ]