diff --git a/infra/THORIUM_DEV_BOOKMARKS.html b/infra/THORIUM_DEV_BOOKMARKS.html index 2fd272b5..a2da1add 100644 --- a/infra/THORIUM_DEV_BOOKMARKS.html +++ b/infra/THORIUM_DEV_BOOKMARKS.html @@ -224,6 +224,8 @@
libaom - Chromium Code Search
libvpx - Chromium Code Search
xnnpack - Chromium Code Search +
extension_prefs.cc - Chromium Code Search +
tab_search_bubble_host.cc - Chromium Code Search

VectorIcons

BUILD.gn - Chromium Code Search diff --git a/infra/thorium_strings.grd b/infra/thorium_strings.grd index 529a962d..cd7b6650 100644 --- a/infra/thorium_strings.grd +++ b/infra/thorium_strings.grd @@ -563,6 +563,13 @@ If you want to use this account one-time only, you can use <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. + + + + Open $1https://www.example-url.com/ in a new tab in Thorium. + + + Thorium @@ -745,10 +752,22 @@ Permissions you've already given to websites and apps may apply to this account. desc="On the chrome://downloads page, the description shown for a blocked file that is dangerous."> Thorium blocked this download because the file is dangerous + + Thorium blocked this download because the file can harm your personal and social network accounts + + + Thorium blocked this download because the file can harm your personal and social network accounts, including $1john@google.com + Thorium blocked this download because the file isn't commonly downloaded and it may be dangerous + + Thorium blocked this download because the archive file includes other files that may hide malware + Thorium blocked this download because the file is deceptive and may make unexpected changes to your device @@ -825,15 +844,32 @@ Permissions you've already given to websites and apps may apply to this account. Thorium recommends you review this extension + + Thorium can't verify where this extension comes from, and it might be unsafe. Remove it from Thorium so it can no longer see and change your data on sites you visit, including personal info. + + + On • Thorium can't verify where this extension comes from + + + Off • Thorium can't verify where this extension comes from + + + This extension hasn't published privacy practices, such as how it collects and uses data. Thorium recommends that you remove it. + - + + + {NUM_EXTENSIONS, plural, + =1 {Thorium recommends that you remove it} + other {Thorium recommends that you remove them}} + Allow extension to show access requests in the Thorium toolbar Warning: Thorium cannot prevent extensions from recording your browsing history. To disable this extension in Incognito mode, unselect this option. - + Remove from Thorium @@ -909,12 +945,6 @@ Permissions you've already given to websites and apps may apply to this account. - - - Not used in Thorium. Placeholder to keep resource maps in sync. - - - Thorium @@ -974,6 +1004,9 @@ Permissions you've already given to websites and apps may apply to this account. Any Thorium data that is generated during the use of this profile (such as the creation of bookmarks, history, passwords, and other settings) can be removed by the work profile administrator. $1Learn more + + Your organization can see and manage browsing data in your work profile, such as your bookmarks, history, and passwords. It can’t see browsing data in personal Thorium profiles. + You're signed in to Thorium! @@ -1019,35 +1052,76 @@ Permissions you've already given to websites and apps may apply to this account. Continue in a new Thorium profile? + + Sign in to Thorium in a new profile? + Switch to existing Thorium profile? A Thorium profile with this account already exists + + You're already signed in as $1foo@gmail.com in another Thorium profile + $1Elisa is already signed in to this Thorium profile. To keep your browsing separate, Thorium can create your own profile for you. - + + $1Elisa is already signed in. To keep your browsing separate, sign in to Thorium in your own profile as $2foo@gmail.com. + + $1Elisa is already signed in to this Thorium profile. This will create a new Thorium profile for $2foo@gmail.com This will create a new Thorium profile for $1foo@gmail.com - - Another account is already signed in. To keep your browsing separate, Thorium can create your own profile for you. - - - Make Thorium your own - - Sign in to get the most out of Thorium + To save and use your passwords and more on all your devices, sign in to Thorium - - Use Thorium without an account + + You can use your passwords from your Google Account in Thorium while you're signed in - - Sign in to Thorium? + + Thorium needs to verify it’s you before some data can be saved in your Google Account and used on all your devices. If you sign out, this data will stay on this device. + + + Some of your Thorium data hasn't been saved in your Google Account yet. Try waiting a few minutes before signing out. + + + You’ll be signed out of most sites when you close all Thorium windows, except your Google Account if you’re signed in to Thorium. To let sites remember you, $1go to settings. + + + + + Sign in to Thorium? + + + Make Thorium your own + + + Use Thorium without an account + + + + + Sign In to Thorium? + + + Make Thorium Your Own + + + Use Thorium Without an Account + + + + + + To save and use passwords and more on all your devices, sign in to Thorium. This password will be saved in your Google Account after you sign in. @@ -1082,26 +1156,28 @@ Permissions you've already given to websites and apps may apply to this account. Sign in to Thorium - - Customize your Thorium - Other Thorium profiles Manage Thorium profiles + + Sign out of Thorium + - - Customize Your Thorium - Other Thorium Profiles Manage Thorium Profiles + + Sign Out of Thorium + @@ -1225,6 +1301,16 @@ Permissions you've already given to websites and apps may apply to this account. + + + + You can open bookmarks, reading mode, and more from the Thorium menu + + + You can open bookmarks, reading mode, and more from the Thorium menu at the top right + + + ''' It also controls what page is shown when you start Thorium. ''' @@ -1418,6 +1504,9 @@ Permissions you've already given to websites and apps may apply to this account. Thorium needs camera permission to create a 3D map of your surroundings + + Thorium needs permission to map your surroundings and track your hands + Thorium needs camera permission for this site @@ -1576,7 +1665,7 @@ Permissions you've already given to websites and apps may apply to this account. - + Your parent has turned off "Permissions for sites, apps and extensions" for Thorium @@ -1648,14 +1737,6 @@ Permissions you've already given to websites and apps may apply to this account. desc="This string appears as a heading on a full-page screen that asks the user to sign in to Thorium with their Google Account. It appears when the user launches Thorium for the first time. When they sign in, they can personalize and customize Thorium and remember their settings in their Google Account. The tone should be inviting and alluring."> Sign in to Thorium - - Make Thorium your own - - - Do more with Thorium - @@ -1668,6 +1749,15 @@ Permissions you've already given to websites and apps may apply to this account. Thorium logo inside a computer screen. + + Customize and control Thorium. Set Thorium as your default. + + + Set Thorium as your default + + + Set Thorium as your default browser + @@ -1679,6 +1769,14 @@ Permissions you've already given to websites and apps may apply to this account. You can switch to see passwords from another Thorium profile + + + + To remove your Google Account from Thorium, sign out + + + To remove your Google Account from Thorium, sign out of Thorium in the Settings page + @@ -1850,9 +1948,6 @@ Permissions you've already given to websites and apps may apply to this account. Cancel Installation - - On your marks... - Installation complete. @@ -1988,10 +2083,22 @@ Permissions you've already given to websites and apps may apply to this account. - - - To clear browsing data from this device only, while keeping it in your Google Account, <a href="#" target="_blank">sign out of Thorium</a>. + + + To delete browsing data from this device only, while keeping it in your Google Account, <a href="#" target="_blank">sign out of Thorium</a>. + + + + + Shortcuts open in Thorium + + + + + Thorium Shortcut + + diff --git a/src/chrome/app/app_management_strings.grdp b/src/chrome/app/app_management_strings.grdp index 0d628445..5d20f1d3 100644 --- a/src/chrome/app/app_management_strings.grdp +++ b/src/chrome/app/app_management_strings.grdp @@ -177,6 +177,24 @@ Denied + + Allowed. Turn on <a href="#">system camera access</a>. + + + Allowed. Turn on <a href="#">system microphone access</a>. + + + Allowed. Turn on <a href="#">system location access</a>. + + + Allowed – $1While in use. Turn on <a href="#">system camera access</a>. + + + Allowed – $1While in use. Turn on <a href="#">system microphone access</a>. + + + Allowed – $1While in use. Turn on <a href="#">system location access</a>. + diff --git a/src/chrome/app/chromium_strings.grd b/src/chrome/app/chromium_strings.grd index b72096e9..e1da80da 100644 --- a/src/chrome/app/chromium_strings.grd +++ b/src/chrome/app/chromium_strings.grd @@ -562,6 +562,13 @@ If you want to use this account one-time only, you can use <a id="osSettingsLink" href="$3https://google.com/">Settings</a>. + + + + Open $1https://www.example-url.com/ in a new tab in Thorium. + + + Thorium @@ -744,10 +751,22 @@ Permissions you've already given to websites and apps may apply to this account. desc="On the chrome://downloads page, the description shown for a blocked file that is dangerous."> Thorium blocked this download because the file is dangerous + + Thorium blocked this download because the file can harm your personal and social network accounts + + + Thorium blocked this download because the file can harm your personal and social network accounts, including $1john@google.com + Thorium blocked this download because the file isn't commonly downloaded and it may be dangerous + + Thorium blocked this download because the archive file includes other files that may hide malware + Thorium blocked this download because the file is deceptive and may make unexpected changes to your device @@ -824,15 +843,32 @@ Permissions you've already given to websites and apps may apply to this account. Thorium recommends you review this extension + + Thorium can't verify where this extension comes from, and it might be unsafe. Remove it from Thorium so it can no longer see and change your data on sites you visit, including personal info. + + + On • Thorium can't verify where this extension comes from + + + Off • Thorium can't verify where this extension comes from + + + This extension hasn't published privacy practices, such as how it collects and uses data. Thorium recommends that you remove it. + - + + + {NUM_EXTENSIONS, plural, + =1 {Thorium recommends that you remove it} + other {Thorium recommends that you remove them}} + Allow extension to show access requests in the Thorium toolbar Warning: Thorium cannot prevent extensions from recording your browsing history. To disable this extension in Incognito mode, unselect this option. - + Remove from Thorium @@ -908,12 +944,6 @@ Permissions you've already given to websites and apps may apply to this account. - - - Not used in Thorium. Placeholder to keep resource maps in sync. - - - Thorium @@ -973,6 +1003,9 @@ Permissions you've already given to websites and apps may apply to this account. Any Thorium data that is generated during the use of this profile (such as the creation of bookmarks, history, passwords, and other settings) can be removed by the work profile administrator. $1Learn more + + Your organization can see and manage browsing data in your work profile, such as your bookmarks, history, and passwords. It can’t see browsing data in personal Thorium profiles. + You're signed in to Thorium! @@ -1018,35 +1051,76 @@ Permissions you've already given to websites and apps may apply to this account. Continue in a new Thorium profile? + + Sign in to Thorium in a new profile? + Switch to existing Thorium profile? A Thorium profile with this account already exists + + You're already signed in as $1foo@gmail.com in another Thorium profile + $1Elisa is already signed in to this Thorium profile. To keep your browsing separate, Thorium can create your own profile for you. - + + $1Elisa is already signed in. To keep your browsing separate, sign in to Thorium in your own profile as $2foo@gmail.com. + + $1Elisa is already signed in to this Thorium profile. This will create a new Thorium profile for $2foo@gmail.com This will create a new Thorium profile for $1foo@gmail.com - - Another account is already signed in. To keep your browsing separate, Thorium can create your own profile for you. - - - Make Thorium your own - - Sign in to get the most out of Thorium + To save and use your passwords and more on all your devices, sign in to Thorium - - Use Thorium without an account + + You can use your passwords from your Google Account in Thorium while you're signed in - - Sign in to Thorium? + + Thorium needs to verify it’s you before some data can be saved in your Google Account and used on all your devices. If you sign out, this data will stay on this device. + + + Some of your Thorium data hasn't been saved in your Google Account yet. Try waiting a few minutes before signing out. + + + You’ll be signed out of most sites when you close all Thorium windows, except your Google Account if you’re signed in to Thorium. To let sites remember you, $1go to settings. + + + + + Sign in to Thorium? + + + Make Thorium your own + + + Use Thorium without an account + + + + + Sign In to Thorium? + + + Make Thorium Your Own + + + Use Thorium Without an Account + + + + + + To save and use passwords and more on all your devices, sign in to Thorium. This password will be saved in your Google Account after you sign in. @@ -1081,26 +1155,28 @@ Permissions you've already given to websites and apps may apply to this account. Sign in to Thorium - - Customize your Thorium - Other Thorium profiles Manage Thorium profiles + + Sign out of Thorium + - - Customize Your Thorium - Other Thorium Profiles Manage Thorium Profiles + + Sign Out of Thorium + @@ -1224,6 +1300,16 @@ Permissions you've already given to websites and apps may apply to this account. + + + + You can open bookmarks, reading mode, and more from the Thorium menu + + + You can open bookmarks, reading mode, and more from the Thorium menu at the top right + + + ''' It also controls what page is shown when you start Thorium. ''' @@ -1417,6 +1503,9 @@ Permissions you've already given to websites and apps may apply to this account. Thorium needs camera permission to create a 3D map of your surroundings + + Thorium needs permission to map your surroundings and track your hands + Thorium needs camera permission for this site @@ -1575,7 +1664,7 @@ Permissions you've already given to websites and apps may apply to this account. - + Your parent has turned off "Permissions for sites, apps and extensions" for Thorium @@ -1647,14 +1736,6 @@ Permissions you've already given to websites and apps may apply to this account. desc="This string appears as a heading on a full-page screen that asks the user to sign in to Thorium with their Google Account. It appears when the user launches Thorium for the first time. When they sign in, they can personalize and customize Thorium and remember their settings in their Google Account. The tone should be inviting and alluring."> Sign in to Thorium - - Make Thorium your own - - - Do more with Thorium - @@ -1667,6 +1748,15 @@ Permissions you've already given to websites and apps may apply to this account. Thorium logo inside a computer screen. + + Customize and control Thorium. Set Thorium as your default. + + + Set Thorium as your default + + + Set Thorium as your default browser + @@ -1678,6 +1768,14 @@ Permissions you've already given to websites and apps may apply to this account. You can switch to see passwords from another Thorium profile + + + + To remove your Google Account from Thorium, sign out + + + To remove your Google Account from Thorium, sign out of Thorium in the Settings page + @@ -1849,9 +1947,6 @@ Permissions you've already given to websites and apps may apply to this account. Cancel Installation - - On your marks... - Installation complete. @@ -1987,10 +2082,22 @@ Permissions you've already given to websites and apps may apply to this account. - - - To clear browsing data from this device only, while keeping it in your Google Account, <a href="#" target="_blank">sign out of Thorium</a>. + + + To delete browsing data from this device only, while keeping it in your Google Account, <a href="#" target="_blank">sign out of Thorium</a>. + + + + + Shortcuts open in Thorium + + + + + Thorium Shortcut + + diff --git a/src/chrome/app/generated_resources.grd b/src/chrome/app/generated_resources.grd index 16e4ef3c..2fdb4606 100644 --- a/src/chrome/app/generated_resources.grd +++ b/src/chrome/app/generated_resources.grd @@ -424,9 +424,16 @@ are declared in tools/grit/grit_rule.gni. Did you mean to go to $1http://intranetsite/? - - Downloads - + + + Download History + + + + + Download history + + Loading... @@ -562,6 +569,10 @@ are declared in tools/grit/grit_rule.gni. Payment methods + + + Passwords + &Back @@ -841,6 +852,9 @@ are declared in tools/grit/grit_rule.gni. Translate text in image with $1Google + + Search with Google Lens + Search page with $1Google Lens @@ -862,6 +876,18 @@ are declared in tools/grit/grit_rule.gni. Help improve autofill + + + Select password + + + + Import passwords + + + + Suggest password... + @@ -1150,6 +1176,9 @@ are declared in tools/grit/grit_rule.gni. Search Image with $1Google Lens + + Search with Google Lens + Translate Text in Image with $1Google @@ -1168,6 +1197,18 @@ are declared in tools/grit/grit_rule.gni. Help Improve Autofill + + + Select Password + + + + Import Passwords + + + + Suggest Password... + @@ -1226,6 +1267,14 @@ are declared in tools/grit/grit_rule.gni. Passwords and &autofill + + + Relaunch to update + + + Your tabs will reopen + + New &tab @@ -1304,12 +1353,6 @@ are declared in tools/grit/grit_rule.gni. Save page &as... - - Enter reader mode - - - Exit reader mode - More too&ls @@ -1375,6 +1418,14 @@ are declared in tools/grit/grit_rule.gni. Passwords and &Autofill + + + Relaunch to Update + + + Your tabs will reopen + + New &Tab @@ -1453,12 +1504,6 @@ are declared in tools/grit/grit_rule.gni. Save Page &As... - - Enter Reader Mode - - - Exit Reader Mode - More Too&ls @@ -1701,8 +1746,8 @@ are declared in tools/grit/grit_rule.gni. &Full screen - - &Clear browsing data... + + &Delete browsing data... &Downloads @@ -1722,6 +1767,9 @@ are declared in tools/grit/grit_rule.gni. Performance + + Search with Google Lens + Sear&ch this page with Google... @@ -1757,8 +1805,8 @@ are declared in tools/grit/grit_rule.gni. &Full Screen - - &Clear Browsing Data... + + &Delete Browsing Data... &Downloads @@ -1778,6 +1826,9 @@ are declared in tools/grit/grit_rule.gni. Performance + + Search with Google Lens + Sear&ch This Page with Google... @@ -2118,6 +2169,10 @@ are declared in tools/grit/grit_rule.gni. desc="The name of the notification source, which is download manager here. Shown in the notification header."> Download manager + + Open and edit + @@ -2228,6 +2283,10 @@ are declared in tools/grit/grit_rule.gni. desc="Message shown in the download shelf when a download contains sensitive content, and the admin has chosen to block the file"> Your organization's policies aren't met + + Scan failed. This file is blocked by your administrator + This file is dangerous @@ -2404,9 +2463,9 @@ are declared in tools/grit/grit_rule.gni. desc="In the download view, 'Pause' link text"> Pause - - Search downloads + + Search download history Files you download appear here @@ -3181,6 +3240,10 @@ are declared in tools/grit/grit_rule.gni. desc="Dangerous warning for a file with sensitive content"> Sensitive content + + Scan failed + Your organization recommends deleting this file because it has sensitive content @@ -3217,6 +3280,10 @@ are declared in tools/grit/grit_rule.gni. desc="Subpage button to cancel a download deep scan"> Cancel + + Your organization blocked this file because the scan failed. + Try again @@ -3353,6 +3420,14 @@ are declared in tools/grit/grit_rule.gni. {COUNT, plural, =1 {1 download in progress} other {# downloads in progress}} + + + Discover enhanced protection to get Thorium's highest level of security for downloads + + + Opens security settings page in a new tab + + Incorrect password. Try again. - - Google Safe Browsing now scans suspicious files you try downloading as part of the enhanced protection you chose. - - - Settings - This file might be malware.$1Google Safe Browsing is checking if this file is unsafe — a scan usually takes a few seconds. @@ -3433,6 +3500,14 @@ are declared in tools/grit/grit_rule.gni. desc="Text shown in the download bubble to allow users to bypass a deep scan"> Download suspicious file + + The next time Google Safe Browsing finds a suspicious download, it will automatically scan it as part of the $1enhanced protection you chose + + + enhanced protection + + + Create a shortcut to this page + + + Site name + + Install app? @@ -4100,15 +4182,6 @@ are declared in tools/grit/grit_rule.gni. See how - - Reminder: Tracking Protection is on - - - If a site you visit isn't working as expected, try temporarily allowing third-party cookies for that site. That will mean less protection but site features are more likely to work as expected. - - - If a site isn't working as expected, you can enable third-party cookies for it through the Tracking Protection option in the address bar. - @@ -4126,6 +4199,9 @@ are declared in tools/grit/grit_rule.gni. + + Base64-encoded ASCII, multiple certificates + Base64-encoded ASCII, single certificate @@ -4703,6 +4779,9 @@ are declared in tools/grit/grit_rule.gni. Switch to captured tab + + Shared tabs can be scrolled and zoomed + @@ -5618,6 +5697,9 @@ are declared in tools/grit/grit_rule.gni. Run ThoriumOS diagnostic tests + + Collect IP address and network measurement results for Measurement Lab, according to their privacy policy (measurementlab.net/privacy) + Subscribe to ThoriumOS system events @@ -5644,6 +5726,9 @@ are declared in tools/grit/grit_rule.gni. Run ThoriumOS diagnostic tests + + Collect IP address and network measurement results for Measurement Lab, according to their privacy policy (measurementlab.net/privacy) + Subscribe to ThoriumOS system events @@ -6157,6 +6242,15 @@ Keep your key file in a safe place. You will need it to create new versions of y Parent account + + Verify you’re a parent + + + To allow this extension, enter your password. + + + To allow $1Junior to install future extensions without your approval, open the Family Link app on your device and update $1Junior’s Thorium settings. + Enter password @@ -6269,24 +6363,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Unsupported extensions disabled - - and $15 more - - - OK, got it - This extension is not listed in the $1Chrome Web Store and may have been added without your knowledge. Learn more about disabled extensions. - - Disable developer mode extensions - - - Extensions running in developer mode can harm your computer. If you're not a developer, you should disable these extensions running in developer mode to stay safe. - @@ -6488,7 +6570,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Extensions can request access to this site - Reload this page to apply your updated settings on this site + To apply your updated settings to this site, reload this page Reload @@ -6538,6 +6620,15 @@ Keep your key file in a safe place. You will need it to create new versions of y Change site permissions + + Installed by your administrator + + + $1Always on this site. Select to change site permissions + + + $1Always on this site. Installed by your administrator + Allowed to read & change this site @@ -6547,9 +6638,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Requesting to read & change this site - - $1Always on this site. Select to change site permissions - Ask on every visit @@ -7096,6 +7184,15 @@ Keep your key file in a safe place. You will need it to create new versions of y In Google Password Manager for $1user@gmail.com + + Use your $1example.com password? + + + You will use your $1example.com password on $2example.de. Only use your password if you trust $2example.de. + + + Use Password + Sign In @@ -7519,19 +7616,21 @@ Keep your key file in a safe place. You will need it to create new versions of y - + An error occurred while checking for updates: $1Unable to contact Google Update + + $1An error message from Google Update. (error code $27: 0x80000005). + + + Update check failed to start (error code $10x80000005). The updater is currently running. Refresh in a minute to check again. - - $1An error message from Google Update. (error code $27: 0x80000005). - @@ -7608,15 +7707,15 @@ Keep your key file in a safe place. You will need it to create new versions of y - - Search Google or type URL - Search Google or type a URL Search Google + + Add to your search + Add shortcut @@ -7758,6 +7857,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Shortcuts + + Toolbar Icons + Cards @@ -7767,9 +7869,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Default Thorium - - Thorium Colors - Change theme @@ -7857,9 +7956,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Grey default color - - Color based on theme - Warm grey @@ -7962,17 +8058,17 @@ Keep your key file in a safe place. You will need it to create new versions of y Pick a color scheme mode - + Light - + Dark Device - Customize your browser even more with extensions from the <a href="#" id="chromeWebstoreLink" on-click="onThoriumWebStoreLinkClick_">Chrome Web Store</a> + Customize your browser even more with extensions from the <a href="#" id="chromeWebstoreLink">Chrome Web Store</a> Find coupons @@ -8049,7 +8145,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Can't create a theme right now. - + Create @@ -8082,7 +8178,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Generated image $12 of $2, in $3 style, with $4 mood. - + Subject @@ -8291,6 +8387,24 @@ Keep your key file in a safe place. You will need it to create new versions of y <br> You can manage settings from the card menu or see more options in Customize Thorium. + + Today's Calendar + + + Don't show Today's Calendar + + + Google Calendar + + + Don't show Google Calendar + + + Outlook Calendar + + + Don't show Outlook Calendar + From your Google Photos @@ -8713,6 +8827,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Customize Thorium + + Search with Google Lens + Unpin @@ -8734,18 +8851,28 @@ Keep your key file in a safe place. You will need it to create new versions of y $1Bookmarks - pinned - - You can open bookmarks, reading mode, and more from the Thorium menu - - - You can open bookmarks, reading mode, and more from the Thorium menu at the top right - You can pin this side panel for easy access To easily get back to the side panel, click Pin at the top right + + You can pin this feature for easy access + + + You can pin this feature for easy access; click the Pin button at the top of the side panel + + + Pinned! Use this feature again from the toolbar + + + Pinned! You can access this feature again from the new button on the toolbar + @@ -8962,6 +9089,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Text formatting + + Read Aloud and Text formatting + Font size @@ -9022,39 +9152,102 @@ Keep your key file in a safe place. You will need it to create new versions of y Getting ready - + Reset - + Turn off highlight - + Turn on highlight - + Listen to the text with natural voice - + + Play keyboard shortcut k + + + Pause keyboard shortcut k + + + Play (k) + + Play - - Pause + + Pause (k) - + + Stop + + Previous sentence - + Next sentence - + More options - + Voice speed - + Voice selection + + Languages... + + + Languages + + + Close + + + No results found + + + Search + + + Clear search + + + Downloading voices... + + + Downloading $1English voices... + + + There are no $1English voices on your device. You can install voices in settings. + + + Learn more. + + + Some Google voices may not be available right now + + + No internet + + + To install this language, clear space on your device + + + preview voice for $1English + + + For higher quality voices, clear space on your device + + + High-quality $1English voice files downloaded + + + Voice files are shared among users to save disk space + To show a simplified view of this page, open the side panel and select Reading mode @@ -9063,9 +9256,12 @@ Keep your key file in a safe place. You will need it to create new versions of y desc="Text for the in-product-help bubble shown for the reading mode bubble when Side Panel Pinning is enabled."> To see a simplified view of this page, go to More Tools > Reading Mode - + Hi. This is a preview + + (loading) + @@ -9216,6 +9412,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Search any image with Google Lens + + Search any image with Lens + Drag an image here or @@ -9347,6 +9546,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Open with + + Select an app to open + Remember this choice @@ -9359,7 +9561,7 @@ Keep your key file in a safe place. You will need it to create new versions of y From $1https://google.com - + Open in app @@ -9369,21 +9571,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Always use - - - - - Select an app on your $1Thoriumbook to open this link - - - - - Select an app on your device to open this link - - - + @@ -9427,6 +9617,40 @@ Keep your key file in a safe place. You will need it to create new versions of y + + + + + + Your Password Is Saved + + + Use This Password On Your iPhone + + + No Thanks + + + + + Your password is saved + + + Use this password on your iPhone + + + No thanks + + + + You can access it on Google Password Manager. + + + Download Thorium with this QR code, and sign in to your Google Account. + + + + $1 (Incognito) @@ -9467,6 +9691,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Hidden saved tab groups + + Your tab groups now automatically save. + + + Your tab groups automatically save and update across all your signed-in devices. + Tab groups @@ -9725,6 +9955,25 @@ Keep your key file in a safe place. You will need it to create new versions of y Turn on + + + Inactive Tabs Get a New Look + + + + + Inactive tabs get a new look + + + + See when tabs are inactive at a glance. You can turn off this new look in settings anytime. + + + Settings + + + Manage the look of inactive tabs here + @@ -10383,20 +10632,20 @@ Check your passwords anytime in $1Google - + - Clear browsing data + Delete browsing data The selected data has been removed from Thorium and synced devices. Your Google Account may have other forms of browsing history like searches and activity from other Google services at <a target="_blank" href="$1">myactivity.google.com</a>. - Cleared Thorium data + Deleted Thorium data Ok, got it - + We were not able to delete all passwords stored in your Google Account. Try again or visit <a target="_blank" href="$1">passwords.google.com</a>. @@ -10678,13 +10927,8 @@ Check your passwords anytime in $1Google Organize similar tabs - - Follow site - - - Unfollow site + + Show specifications @@ -10781,11 +11025,8 @@ Check your passwords anytime in $1Google Organize Similar Tabs - - Follow Site - - - Unfollow Site + + Show specifications @@ -10897,6 +11138,9 @@ Check your passwords anytime in $1Google Dismiss + + New Tabs + Check if tabs can be organized @@ -10907,7 +11151,7 @@ Check your passwords anytime in $1Google You can check for tab group suggestions at any time - You'll get tab group suggestions that group similar tabs. Your open tabs and titles are sent to Google, and may be reviewed by humans to improve this feature. + You'll get tab group suggestions that group similar tabs. Your tabs, titles and groups are sent to Google, and may be reviewed by humans to improve this feature. Learn more about tab group suggestions @@ -10955,7 +11199,7 @@ Check your passwords anytime in $1Google Sign in to let Thorium suggest tab groups - Organizing into a tab group… + Grouping your tabs… Tab group suggestion @@ -10972,23 +11216,11 @@ Check your passwords anytime in $1Google No groups found - - Tab group suggestions are currently unavailable. You can + + Tab group suggestions are currently unavailable. You can <a href="#">refresh now</a> or try again later - - refresh now - - - or try again later - - - You can - - - refresh now - - - or try again later after you open new similar tabs + + You can <a href="#">refresh now</a> or try again later after you open new similar tabs Tip: @@ -11009,7 +11241,7 @@ Check your passwords anytime in $1Google Learn more - Learn more about using AI tools + Learn more about this AI feature Remove $1New Tab from tab group @@ -11020,9 +11252,18 @@ Check your passwords anytime in $1Google Clear + + Clear group suggestions + Tab group name: $1My tab group + + Edit group name $1My tab group + + + Remove group $1My tab group + Thumbs down submits feedback that you dislike this tab group suggestion @@ -11048,6 +11289,95 @@ Check your passwords anytime in $1Google + + + Tabs + + + + {NUM_TABS, plural, =1 {1 tab} other {# tabs}} + + + Create new tab group + + + Tab groups + + + + + {NUM_TABS, plural, =1 {1 Tab} other {# Tabs}} + + + Create New Tab Group + + + Tab Groups + + + + + + This will delete the group from all devices signed into Thorium with this Google Account. + + + + The tabs will remain open on this device but the group will be deleted from all devices signed into Thorium with this Google Account. + + + + + + Don't Ask Again + + + + Delete Tab Group? + + + Ungroup Tab Group? + + + Close Tab(s) and Delete Group? + + + Remove Tab(s) and Delete Group? + + + + Delete Group + + + Ungroup + + + + + + Don't ask again + + + + Delete tab group? + + + Ungroup tab group? + + + Close tab(s) and delete group? + + + Remove tab(s) and delete group? + + + + Delete group + + + Ungroup + + + Tab-group title @@ -11080,6 +11410,12 @@ Check your passwords anytime in $1Google Open group in new window + + Pin group to bookmarks bar + + + Unpin group from bookmarks bar + Send feedback @@ -11115,6 +11451,12 @@ Check your passwords anytime in $1Google Open Group in New Window + + Pin Group to Bookmarks Bar + + + Unpin Group from Bookmarks Bar + Send Feedback @@ -11661,12 +12003,6 @@ Check your passwords anytime in $1Google Share link to - - Follow - - - Following - @@ -12579,14 +12915,43 @@ This can include information about installed software, files, your browser, and Loading account information... - + Ok - - Let's go - + + + + + Separate Browsing? + + + Switch Profile? + + + Create Profile + + + Stay Here + + + + + Separate browsing? + + + Switch profile? + + + Create profile + + + Stay here + + + + No thanks @@ -12596,7 +12961,7 @@ This can include information about installed software, files, your browser, and Ok - + Continue @@ -12608,24 +12973,57 @@ This can include information about installed software, files, your browser, and You just signed in a managed account, creating a new managed profile will allow you to access some resources linked to that account. - - $2Bob's profile is linked to $1bob@gmail.com - - - Separate your browsing? - This new profile will be managed by your organization. <a href="$1" target="_blank">https://help.google.com/articleLinkLearn more</a> This new profile will be managed by $1example.com. <a href="$2" target="_blank">https://help.google.com/articleLinkLearn more</a> - - Separate Browsing? + + Welcome, $1Elisa - - Switch Profile? + + Welcome back, $2Elisa + + When you sign in on this device, you get your passwords and more from your Google Account + + + + Got It + + + + + Got it + + + + Settings + + + + + Some data isn’t saved in your account yet + + + Sign out anyway + + + + go to settings + + + + + Close Window + + + + + Close window + + @@ -12966,6 +13364,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Open settings + + To keep using the passwords and more in your Google Account, verify it's you + @@ -13305,6 +13706,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Notifications blocked + + Location blocked + This site may be trying to trick you into allowing intrusive notifications. @@ -13798,7 +14202,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - Location is turned off in OS Preferences + Location access is turned off in ThoriumOS Settings @@ -14358,15 +14762,6 @@ Please help our engineers fix this problem. Tell us what happened right before y $1Google Hangouts wants to share the contents of your screen with $2https://google.com. - - Share system audio - - - Share window audio - - - Share tab audio - Also share system audio. This device will be muted to prevent feedback. @@ -15743,9 +16138,6 @@ Please help our engineers fix this problem. Tell us what happened right before y QR code - - Use a different device - Use a different passkey @@ -15761,7 +16153,7 @@ Please help our engineers fix this problem. Tell us what happened right before y - Choose a passkey for $1example.com + Use a saved passkey for $1example.com On this device @@ -15775,19 +16167,108 @@ Please help our engineers fix this problem. Tell us what happened right before y From your Thorium profile + + Your Thorium profile + From iCloud Keychain + + iCloud Keychain + From "$1Dashlane" From Windows Hello + + Windows Hello + + + Google Password Manager + From "$1Pixel 7" + + + Create + + + Create passkey + + + Create a passkey to sign in to $1example.com? + + + You can use this passkey to sign in faster across your devices. It will be saved to Google Password Manager for $1example@gmail.com. + + + Save another way + + + Start saving passkeys with Google Password Manager + + + This passkey will be saved to Google Password Manager for $1example@gmail.com + + + Available across your devices + + + Faster, encrypted sign-in + + + Safer than a password + + + To create this passkey with Google Password Manager, verify it's you + + + Your passkey will be saved to Google Password Manager for $1example@gmail.com. You’ll only have to do this once. + + + To use your passkeys on this device, verify it's you + + + You can use all of your passkeys saved to Google Password Manager on this device. You'll only have to do this once. + + + Use a different device + + + $1example.com wants to verify it’s you + + + Touch ID to continue + + + Touch ID is locked. To continue, enter your password. + + + Enter password + + + Can't reach Google Password Manager + + + Can’t reach Google Password Manager. Try again in a few minutes + + + Sign in again + + + To sync and use passkeys from Google + + + Save this passkey outside Incognito? + + + This passkey will be saved to your password manager. Anyone with access to it will be able to use this passkey. + + Side Search @@ -15804,18 +16285,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Submit Feedback - - Compare search results faster from the new side panel - - - Click the "G" button to see more search results in a side panel - - - Click on a result and the page will open in your current tab - - - Click the "X" button to close the side panel - See more search results @@ -15857,9 +16326,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Close Incognito - - - To clear data, close all Incognito windows + + + To delete data, close all Incognito windows This only affects Incognito windows @@ -15868,12 +16337,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Close windows - - + + Sites you visit aren’t saved in Incognito - - To clear Incognito browsing history from your device, close all Incognito tabs + + To delete Incognito browsing history from your device, close all Incognito tabs Close Incognito @@ -16125,18 +16594,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Enhanced Safe Browsing is on - You’re on Thorium’s strongest security - - You have Thorium’s strongest security against harmful websites Enhanced Safe Browsing is off - You’re getting standard protection - - You’re getting standard security protection on this device @@ -16150,12 +16613,12 @@ Please help our engineers fix this problem. Tell us what happened right before y - Also clear browsing data ($1pinterest.com) which will sign you out of $2Pinterest.com. $3Learn more + Also delete browsing data ($1pinterest.com) which will sign you out of $2Pinterest.com.$3Learn more - Also clear browsing data ($1www.google.com) which may sign you out of Google.com. $2Learn more + Also delete browsing data ($1www.google.com) which may sign you out of Google.com. $2Learn more @@ -16292,13 +16755,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Enabled – $1tabs shrink to pinned tab width - - - Tab Groups Save and Sync - - - Enables saving and recalling of tab groups. Right click a tab group to save it. Recall groups from the bookmarks bar. - Customize Thorium Side Panel @@ -16346,6 +16802,73 @@ Please help our engineers fix this problem. Tell us what happened right before y Select an area to search with Lens + + Google Lens Search Bubble + + + Copy + + + Text copied + + + More options + + + My Activity + + + Dismiss + + + Translate + + + Select text + + + Learn more + + + Select anything to search with Google Lens or press escape to exit Google Lens + + + Select anything to search with Google Lens + + + Drag to search + + + Select text to search + + + Click to search + + + Click to exit Google Lens + + + Send feedback + + + Send feedback for search with Lens + + + + Close + + + Continue + + + When you use Google Lens, a screenshot of the page is sent to Google. $1Learn more + + + Learn more + + + Search anything on this page with Google Lens + Thumbnail tab strip for tablet mode @@ -16364,9 +16887,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - Enhanced protection does more to block phishing and malware - - Enhanced Safe Browsing does more to protect you against dangerous websites, downloads, and extensions @@ -16399,11 +16919,11 @@ Please help our engineers fix this problem. Tell us what happened right before y Continue as $1Albus (or Albus Dumbledore) - + Choose an account to continue - - Confirm you want to sign in to $1rp.example with $2idp.example + + Choose an account To continue, $1idp.com will share your name, email address, and profile picture with this site. @@ -16417,16 +16937,19 @@ Please help our engineers fix this problem. Tell us what happened right before y To continue, $1idp.com will share your name, email address, and profile picture with this site. See this site's $2privacy policy$3 and $4terms of service$5. - + Use a different account + + Back + Continue You can use your $1idp.example account on this site. To continue, sign in to $1idp.example. - + Sign in to $1idp.example @@ -16483,7 +17006,7 @@ Please help our engineers fix this problem. Tell us what happened right before y If this issue keeps happening, you can try other ways to continue on $1rp.example. - + Sign in to $1rp.example diff --git a/src/chrome/app/settings_chromium_strings.grdp b/src/chrome/app/settings_chromium_strings.grdp index ccf6f21b..0bff0132 100644 --- a/src/chrome/app/settings_chromium_strings.grdp +++ b/src/chrome/app/settings_chromium_strings.grdp @@ -265,7 +265,7 @@ Warns you about dangerous sites, even ones Google didn't know about before, by analyzing more data from sites than standard protection. You can choose to skip Thorium warnings. - Learn more about <a href="$1" target="_blank"><a href="$1" target="_blank">how Thorium keeps your data private</a></a> + Learn more about <a href="#" id="enhancedProtectionLearnMoreLink" on-click="onEnhancedProtectionLearnMoreClick_">how Thorium keeps your data private</a></a> Make it harder for people with access to your internet traffic to see which sites you visit. Thorium uses a secure connection to look up a site's IP address in the DNS (Domain Name System). @@ -297,6 +297,18 @@ You can manage your signed-in Google Accounts. Your Google Accounts are used for Thorium browser, Play Store, Gmail, and more. If you want to add an account for someone else, like a family member, add a new person to your $1Thoriumbook instead. <a>Learn more</a> + + Sign in to Thorium when you sign in to other Google services + + + When signing into Google services like Gmail or Youtube with $1foo@example.com, you can sign in to Thorium with the same account + + + Automatically sign me in to Thorium + + + Don’t sign me in to Thorium + @@ -314,6 +326,15 @@ Sign in to sync and personalize Thorium across your devices + + To get personalization, include Thorium in Web & App Activity + + + To get personalization and other features, include Thorium in Web & App Activity and linked Google services + + + Link Thorium and other Google services for personalization and other purposes + diff --git a/src/chrome/app/settings_strings.grdp b/src/chrome/app/settings_strings.grdp index 639230fc..c040cd59 100644 --- a/src/chrome/app/settings_strings.grdp +++ b/src/chrome/app/settings_strings.grdp @@ -57,21 +57,133 @@ Get the most out of Thorium - - This guide helps you understand your choices, so that Thorium works the way you want to + + Thorium makes the web work better for you - - This guide helps you understand important choices you have as you use Thorium. And it helps you make those choices, so that Thorium works the way you want it to. - - - More than a browser - - - Your data in Thorium + + Your data as you browse Beyond cookies + + How does data help Thorium work better for you? + + + How are browsing and search history different? + + + Why is Thorium moving beyond third-party cookies? + + + Making the web work better for you means: + <ul> + <li>Keeping you safe as you browse, and</li> + <li>Supporting a thriving ecosystem that keeps the web safe, open, fast and free</li> + </ul> + + + Thorium gives you choice + + + You can customize Thorium the way you want: + <ul> + <li><em>The best of Google</em>, for those who want it. For example, you can choose Google Search as Thorium’s default search engine and use Google Password Manager to get all your passwords on any device. </li> + <li><em>Meaningful choice</em>: Thorium offers you choice and control with settings, and information to help you make meaningful decisions.</li> + <li><em>Extensions</em>: You can extend Thorium functionality with over 100,000 extensions in the <a target="_blank" href="$1">Chrome Web Store</a>.</li> + </ul> + + + Thorium supports a free web + + + Ads are critical to many online businesses. They help keep content free online, which helps ensure that anyone can access content. Thorium develops ways to let sites show you personalized ads while protecting your privacy. Done well, advertising benefits everyone on the web because when you see an ad: + <ul> + <li>You might find something new or interesting</li> + <li>The advertiser might find a new customer</li> + <li>The site you visit earns money by hosting the ad</li> + </ul> + + + Ads revenue also supports Google’s many free products and services, like Thorium, Gmail, Maps, and YouTube. + + + When you browse the web you generate data - for example, the words you search for, the sites you visit, and the browser and device you use. + + + This information can be useful. For example, it can help Thorium improve by understanding how quickly pages load in different conditions. And based on your settings, it can also: + <ul> + <li>Help you browse faster. For example, your past Google searches can help Thorium prompt you with predictions for your future ones.</li> + <li>Allow sites to optimize your experience for your device. For example, a site can streamline its content for your mobile phone and remember your preferences, like your preferred language. </li> + <li>Help advertisers, including Google, show more relevant ads.</li> + </ul> + + + What’s the difference between your browsing history in Thorium and your search history? + + + Your Thorium browsing history is all the sites you’ve visited in Thorium over a period of time. + + + Visit <a target="_blank" href="$1">$1chrome://history</a> to review and manage your browsing history. Learn more about <a target="_blank" href="$2">your browsing data in Thorium and how to manage it</a>. + + + When you search for something in Thorium’s address bar, your default search engine receives your request and responds by showing relevant results. Your search history includes things you’ve searched for over a period of time. + + + You can review your search history and settings in <a target="_blank" href="$1">My Activity</a>, if: + <ul> + <li>You use Google Search</li> + <li>You’re signed in to your Google account</li> + <li>You have Web & App Activity turned on</li> + </ul> + + + Once you find a site you want to explore, you decide (using site permissions) if a site can use certain features, for example: + <ul> + <li>Use your device’s Camera, Location, and Microphone</li> + <li>Store data on your device</li> + <li>Provide site features, like Notifications</li> + </ul> + + + Depending on site permissions, cookies are one way that allow sites to store information about your online activity. + + + Review site permissions at <a target="_blank" href="$1">$1chrome://settings/content</a> + + + Cookies can enrich your online experience, allowing sites to offer you useful features + + + Imagine you have a favorite cafe you visit for your morning coffee. Maybe you’re such a frequent customer that the shop owner knows you by name and can bring you your order, a double espresso with a single sugar, right when you walk in the door. + + + Cookies allow for this same level of preference customization on the web. When you visit a site, the site can save a cookie in your device’s browser storage to remember your site preferences, such as the language you speak or items that you want saved in a shopping cart. Later, if you visit the site again using the same browser, that site can read the cookie it set and you can start up where you left off. These types of cookies are often referred to as first-party cookies, because they’re set by the site you visit. + + + Sometimes sites use cookies in ways they weren’t initially intended + + + That’s why Thorium is planning to phase out the use of “third-party” cookies once we’ve addressed any remaining competition concerns of the <a target="_blank" href="$1">UK’s Competition and Markets Authority (CMA)</a>. + + + What are third-party cookies? A site you visit can embed content from other sites or services, for example images, ads, social media content, and text. When any of these other sites use cookies to save info about you, we call that a third-party cookie. If you visit several sites that embed content from the same source, like an ad network, third-party cookies can be used for advertising purposes and to track you as you browse. + + + Thorium is part of a <a target="_blank" href="$1">collaborative effort</a> to reduce cross-site tracking and phase out the use of third-party cookies. But we’re trying to do it responsibly because many sites rely on third-party cookies to work as designed. For example, many sites use third-party cookies to simplify signing in, to support embedded chat and comment systems, and for payment services. And advertisers often use third-party cookies to better personalize ads. That matters because sites often count on ads to help pay expenses and keep their online content free of charge. + @@ -120,7 +232,7 @@ Extract text from PDF - Scan PDF to extract text for the screen reader. Only supported on Thorium browser + Scan PDF to extract text for assistive technology Live Caption @@ -259,6 +371,9 @@ Show bookmarks bar + + Show tab groups in bookmarks bar + Tab hover preview card @@ -297,12 +412,6 @@ Show warning before quitting with ⌘Q - - Reader mode for web pages - - - Offer to show articles in reader mode, when supported - @@ -345,8 +454,8 @@ $1Adblocker plusplus is controlling this setting - - Clear + + Delete Custom @@ -434,6 +543,9 @@ More actions for $1My main card + + More actions for $1My main card, CVC saved + Turn on virtual card @@ -944,21 +1056,21 @@ - + Time range - - To clear browsing data from this device only, while keeping it in your Google Account, <a href="#" target="_blank">sign out</a>. + + To delete browsing data from this device only, while keeping it in your Google Account, <a href="#" target="_blank">sign out</a>. - - To clear browsing data from all of your synced devices and your Google Account, <a href="#" target="_blank">visit sync settings</a>. + + To delete browsing data from all of your synced devices and your Google Account, <a href="#" target="_blank">visit sync settings</a>. - - To clear browsing data from all of your synced devices and your Google Account, <a href="#" target="_blank">enter your passphrase</a>. + + To delete browsing data from all of your synced devices and your Google Account, <a href="#" target="_blank">enter your passphrase</a>. - - To clear browsing data from all of your synced devices and your Google Account, <a href="#" target="_blank">sign in</a>. + + To delete browsing data from all of your synced devices and your Google Account, <a href="#" target="_blank">sign in</a>. Browsing history @@ -966,8 +1078,8 @@ Signs you out of most sites - - Signs you out of most sites. You'll stay signed in to your Google Account so your synced data can be cleared. + + Signs you out of most sites. You'll stay signed in to your Google Account so your synced data can be deleted. Signs you out of most sites. You won't be signed out of your Google Account. @@ -979,10 +1091,10 @@ Signs you out of most sites. You'll stay signed in to your Google Account. - Clears history, including in the search box + Deletes history, including in the search box - - Clears history from all synced devices + + Deletes history from all synced devices <a target="_blank" href="$1">Search history</a> and <a target="_blank" href="$2">other forms of activity</a> may be saved in your Google Account when you're signed in. You can delete them anytime. @@ -1005,16 +1117,9 @@ Cookies and other site data - - - Passwords and other sign-in data - - - - - Passwords and passkeys - - + + Passwords and other sign-in data + Autofill form data @@ -1135,6 +1240,24 @@ Choose time range + + Moderate + + + Balanced (recommended) + + + Maximum + + + Get moderate memory savings. Your tabs become inactive after a longer period of time. + + + Get balanced memory savings. Your tabs become inactive after an optimal period of time. + + + Get maximum memory savings. Your tabs become inactive after a shorter period of time. + Add to the "always keep these sites active" list @@ -1172,10 +1295,10 @@ Energy Saver - Turn on when my computer is unplugged + Turn on when your computer is unplugged - Turn on only when my battery is at $120% or lower + Turn on only when your battery is at $120% or lower Energy saver options @@ -1183,6 +1306,12 @@ Turn on Energy Saver to extend battery life + + Inactive tabs appearance + + + A dotted circle appears around site icons. + @@ -1349,6 +1478,9 @@ Standard preloading + + More info about turning on standard preloading + Some of the pages you visit are preloaded @@ -1361,6 +1493,9 @@ More pages are preloaded. Pages may be preloaded through Google servers when requested by other sites. + + More info about turning on extended preloading + Browsing and searching is faster than standard preloading @@ -1388,6 +1523,29 @@ + + + Offer writing help + + + "Help me write" can automatically open when a text box on a site can be filled with short-form content + + + Allow "Help me write" to automatically open + + + Don't allow "Help me write" to automatically open + + + Never offer writing help on these sites + + + No sites added + + + Remove $1https://www.google.com from disabled sites + + Sites can help verify you're not a bot @@ -1658,6 +1816,12 @@ Ad privacy + + Tracking Protection + + + Manage your tracking protections to make your experience more private on the web + Web & App Activity @@ -1845,6 +2009,14 @@ =1 {To protect your data, permissions were removed from a site you haven't visited recently} other {To protect your data, permissions were removed from sites you haven't visited recently}} + + {NUM_SITES, plural, + =1 {To protect your data, permissions were removed from a site} + other {To protect your data, permissions were removed from some sites}} + + + Dangerous site. Thorium removed Notifications. + {NUM_SITES, plural, =1 {Review complete for 1 site} @@ -1921,8 +2093,8 @@ {NUM_EXTENSIONS, plural, - =1 {Review 1 extension that was taken down from the Chrome Web Store} - other {Review {NUM_EXTENSIONS} extensions that were taken down from the Chrome Web Store}} + =1 {Review 1 extension that may be unsafe} + other {Review {NUM_EXTENSIONS} extensions that may be unsafe}} {NUM_SITES, plural, @@ -2223,20 +2395,20 @@ Control what information websites can use and what content they can show you - - Clear data + + Delete data - - Clearing data... + + Deleting data... - - Data cleared. + + Data deleted. - - Clear browsing data + + Delete browsing data - - Clear history, cookies, cache, and more + + Delete history, cookies, cache, and more $1Block - $242 @@ -2556,7 +2728,7 @@ Not allowed to automatically download multiple files - Sites use this setting to enter picture-in-picture automatically. This lets you continue watching a video, while freeing up your screen for other tasks. + Sites use this feature to enter picture-in-picture automatically. This lets you continue watching a video, while freeing up your screen for other tasks. Sites can enter picture-in-picture automatically @@ -2597,6 +2769,21 @@ Don't allow sites to connect to Bluetooth devices + + Sites use this feature to scroll and zoom shared tabs + + + Sites can ask to scroll and zoom shared tabs + + + Don't allow sites to scroll and zoom shared tabs + + + Allowed to scroll and zoom shared tabs + + + Not allowed to scroll and zoom shared tabs + Sites usually use your video camera for communication features like video chatting @@ -2688,16 +2875,13 @@ Not allowed to use fonts installed on your device - Sites use this setting to offer immersive fullscreen experiences regardless of user gestures - - - Entering fullscreen requires a user gesture by default + Sites use this feature to enter full screen automatically. Typically, entering full screen requires user interaction. - Allowed to enter fullscreen automatically + Allowed to enter full screen automatically - Not allowed to enter fullscreen automatically + Not allowed to enter full screen automatically Sites usually connect to HID devices for features that use uncommon keyboards, game controllers, and other devices @@ -2765,6 +2949,21 @@ Not allowed to use V8 optimizer + + Sites use keyboard lock to capture keyboard input that would otherwise be handled by the browser or the operating system. + + + Sites can ask to lock your keyboard + + + Don't allow sites to lock your keyboard + + + Allowed to lock your keyboard + + + Not allowed to lock your keyboard + Sites usually use your location for relevant features or info, like local news or nearby shops @@ -2891,6 +3090,21 @@ Download PDFs + + Sites use pointer lock to hide the mouse pointer and prevent it from leaving the page. + + + Sites can ask to lock your mouse pointer + + + Don't allow sites to lock your pointer + + + Allowed to lock your pointer + + + Not allowed to lock your pointer + Sites might send pop-ups to show ads, or use redirects to lead you to websites you may not want to visit @@ -3144,14 +3358,17 @@ Advanced - + Hide your IP address - - When you’re signed in to Thorium, this setting can limit what suspected trackers can see as you browse. When a page loads, some requests for content get sent through privacy servers. Learn more about <a href="#" aria-label="$1" aria-description="$2" target="_blank">how IP protection works</a> + + When you’re signed in to Thorium, some of your traffic may be sent through privacy servers if Thorium suspects a site may be tracking you - - Learn more about hiding your IP address + + Limit digital fingerprinting + + + This setting makes it harder for sites to identify you using data about your device and browser, such as your device model or browser version Block all third-party cookies @@ -3171,6 +3388,9 @@ Affects the sites listed here. Inserting “[*.]” before a domain name creates an exception for the entire domain. For example, adding “[*.]google.com” means that third-party cookies can also be active for mail.google.com, because it’s part of google.com. + + Only applies to third-party cookie blocking + Tracking Protection is temporarily unavailable. While Thorium is updating this feature, sites can temporarily use third-party cookies unless you block them. <a target="_blank" href="$1" aria-label="$2">Learn more</a></a> @@ -3285,7 +3505,7 @@ Mute (default) - + Allow @@ -3414,8 +3634,8 @@ All data stored by $1www.example.com will be deleted. - - All data and cookies stored by $1www.example.com will be cleared. + + All data and cookies stored by $1www.example.com will be deleted. You’ll be signed out of this site, including in open tabs @@ -3678,6 +3898,9 @@ Sign in + + Verify it's you + Because this account is managed by $1example.com, your bookmarks, history, passwords, and other settings will be cleared from this device. However, your data will remain stored in your Google Account and can be managed on <a href="$2" target="_blank"><a href="$2" target="_blank">Google Dashboard</a></a>. @@ -3739,9 +3962,6 @@ Sync will start once you leave sync settings - - Manage your Google Account - Activity and interactions @@ -3766,6 +3986,29 @@ Control how your browsing history is used to personalize Search and more + + Control how browsing history is used with your other data across Google services + + + Web & App Activity + + + Linked Google services + + + Ask me every time + + + + + Manage your Google Account + + + + + Manage Your Google Account + + diff --git a/src/chrome/browser/ui/android/strings/android_chrome_strings.grd b/src/chrome/browser/ui/android/strings/android_chrome_strings.grd index 41bd4432..3440e1ec 100644 --- a/src/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/src/chrome/browser/ui/android/strings/android_chrome_strings.grd @@ -208,9 +208,6 @@ CHAR_LIMIT guidelines: Site not working? Third-party cookies are blocked - - Site not working? Try temporarily allowing third-party cookies - @@ -220,6 +217,11 @@ CHAR_LIMIT guidelines: Advanced + + + Control your data & account + + General @@ -304,24 +306,27 @@ CHAR_LIMIT guidelines: Control how your browsing history is used to personalize Search and more - - Personalize Google services + + Personalization - - Control how your synced history can be used to personalize other Google services + + Personalization & Linking + + + Control how browsing history is used with your other data across Google services To get the most personalized experience, include Thorium in Web & App Activity and linked Google services - + Web & App Activity Linked Google services - - Link Thorium and other Google services if you want them to personalize your experience using data from one another + + Link Thorium and other Google services for personalization and other purposes @@ -578,10 +583,18 @@ CHAR_LIMIT guidelines: Turn off - + Autofill Options + + + Restart now + + + + Undo setting change + Delete saved security codes? @@ -630,7 +643,7 @@ CHAR_LIMIT guidelines: Passwords - Password Manager + Google Password Manager Password saving is turned on by your administrator @@ -1197,14 +1210,14 @@ For example, some websites may respond to this request by showing you ads that a Please verify that this is a valid provider or try again later - - Clear browsing data + + Delete browsing data - - Clear history, cookies, site data, cache… + + Delete history, cookies, site data, cache… - Cleared Thorium data + Deleted Thorium data The selected data has been removed from Thorium and your synced devices. @@ -1227,10 +1240,10 @@ Your Google account may have other forms of browsing history like searches and a Signs you out of most sites. You won't be signed out of your Google Account. - Clears history, including in the search box + Deletes history, including in the search box - Clears history from all synced devices + Deletes history from all synced devices <link1>Search history</link1> and <link2>other forms of activity</link2> may be saved in your Google Account when you’re signed in. You can delete them anytime. @@ -1241,8 +1254,8 @@ Your Google account may have other forms of browsing history like searches and a To sign out of your Google Account on all websites, <link1>sign out of Thorium</link1>. - - Clearing your browsing data doesn't sign you out of your Google Account. To do so, <link1>sign out of Thorium</link1>. + + Deleting your browsing data doesn't sign you out of your Google Account. To do so, <link1>sign out of Thorium</link1>. Your search engine is %1$sBing. See their instructions for deleting your search history, if applicable. @@ -1257,13 +1270,16 @@ Your Google account may have other forms of browsing history like searches and a Autofill form data - Tabs on this device + Tabs - - Clearing browsing data + + Can’t be closed across multiple windows - - Clear data + + Deleting browsing data + + + Delete data Please wait… @@ -1302,10 +1318,10 @@ Your Google account may have other forms of browsing history like searches and a These sites and apps seem important to you: - Clear + Delete - - Clear browsing data… + + Delete browsing data… Open full Thorium history @@ -1313,9 +1329,21 @@ Your Google account may have other forms of browsing history like searches and a Basic + + Some of your history might not show up here. To see all your Thorium history, open full Thorium history. + + + Some of your history might not show up here. To see all your Thorium history, open full Thorium history. Also, your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. + Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. + + You may see the history from other apps that open links in Thorium. + + + You may see the history from other apps that open links in Thorium. Your Google Account may have other forms of browsing history at <link>myactivity.google.com</link>. + Blocked site @@ -1703,6 +1731,23 @@ Your Google account may have other forms of browsing history like searches and a Learn more about <link>how Thorium keeps your data private</link> + + + Filter by app + + + Search by app, date, and more. + + + App filter sheet + + + App filter sheet is opened. + + + App filter sheet is closed. + + Standard protection: @@ -2117,7 +2162,7 @@ Your Google account may have other forms of browsing history like searches and a Turn off sync? - Clear your Thorium data from this device? + Delete your Thorium data from this device? Some Thorium features won\u2019t be available anymore @@ -2129,11 +2174,27 @@ Your Google account may have other forms of browsing history like searches and a Your bookmarks, history, and other Thorium data will no longer be synced to your Google Account - Also clear your Thorium data from this device + Also delete your Thorium data from this device Because you're signing out of an account managed by %1$sgoogle.com, your Thorium data will be deleted from this device. It will remain in your Google Account. + + + Signed out. Sign back in to use the bookmarks, passwords and more in your account. + + + + Unsaved data + + + + Some of your Thorium data hasn\u2019t been saved in your Google Account yet.\nTry waiting a few minutes before signing out. If you sign out now, this data will be deleted. + + + + Delete and sign out + Contacting Google. This may take a minute… @@ -2196,6 +2257,10 @@ Your Google account may have other forms of browsing history like searches and a History + + + History and Tabs + Passwords @@ -2211,6 +2276,10 @@ Your Google account may have other forms of browsing history like searches and a Apps + + + When on, use and save data in your Google Account. When off, data is saved only to this device. + Payment methods, offers, and addresses using Google Pay @@ -2220,6 +2289,18 @@ Your Google account may have other forms of browsing history like searches and a Review your synced data + + + Data in your account + + + + Review your account data + + + + Manage accounts on this device + Encryption @@ -2237,7 +2318,7 @@ Your Google account may have other forms of browsing history like searches and a Payment methods and addresses from Google Pay won’t be encrypted. Browsing history from Thorium won’t sync. -Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Google. If you forget your passphrase or want to change this setting, BEGIN_LINKclear the Thorium data in your accountEND_LINK. +Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Google. If you forget your passphrase or want to change this setting, BEGIN_LINKdelete the Thorium data in your accountEND_LINK. Passphrase @@ -2255,7 +2336,7 @@ Only someone with your passphrase can read your encrypted data. The passphrase i This field cannot be blank - If you forgot your passphrase or want to change this setting, BEGIN_LINKclear the Thorium data in your accountEND_LINK. + If you forgot your passphrase or want to change this setting, BEGIN_LINKdelete the Thorium data in your accountEND_LINK. Passphrases do not match @@ -2263,7 +2344,7 @@ Only someone with your passphrase can read your encrypted data. The passphrase i Passphrase encryption doesn’t include payment methods and addresses from Google Pay. -To change this setting, BEGIN_LINKclear the Thorium data in your accountEND_LINK. +To change this setting, BEGIN_LINKdelete the Thorium data in your accountEND_LINK. Incorrect passphrase @@ -2333,6 +2414,9 @@ To change this setting, BEGIN_LINKclear the Thorium d Update %1$sThorium to start sync + + To save and use new passwords in your Google Account, update Google Play services + @@ -2364,15 +2448,15 @@ To change this setting, BEGIN_LINKclear the Thorium d The service is not available; try again later. - - Accept and sign in - - Clearing account data + Deleting account data Please wait… + + Update Google Play services + @@ -2570,7 +2654,7 @@ To change this setting, BEGIN_LINKclear the Thorium d To manage your passwords, update Google Play services - + Update @@ -2736,9 +2820,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Go back to site - - Install this app - Add to Home screen @@ -2793,6 +2874,9 @@ To change this setting, BEGIN_LINKclear the Thorium d Unsubscribe + + Unsubscribing… + Unsubscribed from notifications @@ -3036,8 +3120,8 @@ To change this setting, BEGIN_LINKclear the Thorium d You’ll find your history here - - You can see the pages you’ve visited or clear them from your history + + You can see the pages you’ve visited or delete them from your history Can’t find that page. Check your spelling or try a search on %1$sGoogle. @@ -3045,14 +3129,31 @@ To change this setting, BEGIN_LINKclear the Thorium d Can’t find that page. Check your spelling or try a web search. + + + Nothing to show yet + + + The pages you've opened in Thorium while using %1$sYouTube will show up here. + + + + No search results found + + + Try searching for something else or open full Thorium history to see more results. + Search your history + + From %1$sYouTube + Sites you visit aren’t saved in Incognito - - To clear Incognito browsing history from your device, close all Incognito tabs. + + To delete Incognito browsing history from your device, close all Incognito tabs. @@ -3062,6 +3163,12 @@ To change this setting, BEGIN_LINKclear the Thorium d Close all Incognito tabs + + Open in new Thorium tab + + + Open in Incognito Thorium tab + @@ -3200,7 +3307,7 @@ To change this setting, BEGIN_LINKclear the Thorium d Opening Thorium without a profile lock will remove your saved passwords and payment methods from the car. Using a profile lock keeps this data secure. - Also clear bookmarks, history, and more from this car + Also delete bookmarks, history, and more from this car Delete & continue @@ -3295,6 +3402,9 @@ To change this setting, BEGIN_LINKclear the Thorium d Sign in to manage your preferences + + Get your bookmarks, passwords, and more on all your devices + @@ -3333,9 +3443,15 @@ To change this setting, BEGIN_LINKclear the Thorium d Get all your tabs + + You’ll find tabs from other devices here + Sync to get your tabs from your other devices + + To see tabs from other devices, sync your tabs and history + Use Thorium your way @@ -3348,6 +3464,15 @@ To change this setting, BEGIN_LINKclear the Thorium d Turn on sync + + Turn on + + + Sign in + + + Get your bookmarks, passwords and more on all your devices + Thorium does not have access to the requested resource. @@ -3625,7 +3750,7 @@ To change this setting, BEGIN_LINKclear the Thorium d Collapse to side view - View your web history here + View your Thorium history here Minimize tab @@ -3746,14 +3871,14 @@ To change this setting, BEGIN_LINKclear the Thorium d Recent tabs - - Web history + + Thorium history History - Clear browsing data + Delete browsing data Downloads @@ -3875,9 +4000,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Show in folder - - New folder… - Choose folder @@ -3902,9 +4024,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Edit bookmark - - Add folder - Edit folder @@ -3967,9 +4086,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Tracked products - - You’ll find your tracked products here - Stopped tracking price @@ -4273,9 +4389,12 @@ To change this setting, BEGIN_LINKclear the Thorium d Signed in as %sBruce Wayne. Opens settings. - + Signed out. Opens dialog to sign in and turn on sync. + + Signed out. Opens options to sign in. + Open the home page @@ -4297,6 +4416,12 @@ To change this setting, BEGIN_LINKclear the Thorium d Leave Incognito mode + + %1$sCrater Lake National Park (U.S. National Park Service) and %2$d12 other tabs + + + Unnamed group + Tab @@ -4430,6 +4555,12 @@ To change this setting, BEGIN_LINKclear the Thorium d %1$s3 tabs closed + + %1$s3 tabs deleted + + + %1$s1 tab deleted + Do you want to delete %1$sexample.pdf? @@ -4535,9 +4666,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Page insights Loading Indicator - Your activity in Page Insights is saved in your <link>Google Account</link>. - - Your activity in Page Insights is saved in your Google Account. <link>Learn how to manage this</link> @@ -4547,6 +4675,20 @@ To change this setting, BEGIN_LINKclear the Thorium d Close button to close privacy notice of page insights hub. + + + Sign in to save this page + + + Disabled save button + + + Share button + + + Page insights button + + Following... @@ -4688,8 +4830,8 @@ To change this setting, BEGIN_LINKclear the Thorium d %1$sYouTube also has data in Thorium - - You can clear the data in Thorium Settings + + You can delete the data in Thorium Settings Keep Data @@ -5066,51 +5208,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Make sure a phone app is enabled on this device - - - text - - - - - Can't share %1$svideo - - - Couldn't share %1$svideo - - - - Make sure %1$sPixel XL has sync turned on in Thorium - - - Make sure this device is connected to the internet - - - Make sure %1$sPixel XL is connected to the internet - - - Something went wrong. Try again later. - - - - - Text is too large - - - Try sharing the text in smaller chunks - - - - - Text shared from other device - - - Text shared from %1$sPixel 3 - - - Copied to your clipboard - - Submit %1$s123 on %2$sZoe's Macbook? @@ -5813,15 +5910,6 @@ To change this setting, BEGIN_LINKclear the Thorium d Management - - Your browser is managed by your administrator - - - Your browser is managed by %1$sgoogle.com - - - Your browser is not managed - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Thorium. @@ -5860,11 +5948,14 @@ To change this setting, BEGIN_LINKclear the Thorium d - Clear browsing data + Delete browsing data {NUM_TABS, plural, =1 {1 tab on this device} other {# tabs on this device}} + + Tabs on this device + No tabs on this device @@ -5894,8 +5985,8 @@ To change this setting, BEGIN_LINKclear the Thorium d More options - - More options to clear browsing data + + More options to delete browsing data Calculating... @@ -5988,7 +6079,7 @@ To change this setting, BEGIN_LINKclear the Thorium d Use another device - + Lorem Ipsum @@ -6018,10 +6109,121 @@ To change this setting, BEGIN_LINKclear the Thorium d Passkey confirmation sheet closed + + + Summary + + + Share with summary sheet + + + Share with summary sheet opened + + + Share with summary sheet closed + + + Thumbs up submits feedback that you like this summary + + + Thumbs down submits feedback that you dislike this summary + + + Add summary + + + Something went wrong. Summary couldn\u2019t be completed + + + This is an experimental AI feature and won\u2019t always get it right. <link>Learn more</link> + + + Select an issue + + + Submit + + + Share with summary feedback sheet + + + Share with summary feedback sheet opened + + + Create summary + + + Remove summary + + + Share with summary feedback sheet closed + + + The URL of the page you\u2019re providing feedback for will be sent to Google, and may be reviewed by humans to improve this feature + + + Offensive or unsafe + + + Inaccurate + + + Repetitive + + + Missing information + + + Other + + +%1$s1 + + %1$sJane Doe invited you to access a shared item. + + + Someone + + + Open Tab Group? + + + Block + + + Not now + + + Accept + + + + + Caution + + + %1$swww.cheapalcohol.com would like to ask Android to give you options for sharing your identity information. + + + Share + + + %1$swww.cheapalcohol.com would like to ask Android for access to your identity. Thorium cannot determine what privacy risks this may pose. + + + Share Anyway + + + Do Not Share + + + + + Loading PDF… + diff --git a/src/chromeos/chromeos_strings.grd b/src/chromeos/chromeos_strings.grd index 888c2a11..e1d623eb 100644 --- a/src/chromeos/chromeos_strings.grd +++ b/src/chromeos/chromeos_strings.grd @@ -338,44 +338,51 @@ - - + + Write faster and with more confidence - - Use Help me write to create a draft or refine existing work, powered by Google AI. + + Use Help me write to create a draft or refine existing work, powered by Google AI - + No thanks - + Try it - + Help me write - + Enter a prompt like "write a thank you note" - + Rewrite - - Enter a prompt like "sound more confident" + + Enter a prompt like "make it more confident" - - Settings + + Enter a prompt - + + Help me write settings + + Submit - + Experiment + - Experimental feature + AI-powered experimental feature + + + Feedback for mahi feature Show outlines @@ -384,7 +391,13 @@ Summarize - Ask question + Ask question, e.g. "What is this page about?" + + + Mahi Menu + + + Open panel Summary @@ -451,7 +464,7 @@ - Turn on Bluetooth to discover nearby devices + Turn on Bluetooth to scan for nearby hotspots @@ -803,7 +816,7 @@ - + Scan @@ -1109,7 +1122,7 @@ To test battery charging rate, let your battery drain for a short period - You need at least 500 MB free to run a Memory test. To free up space, go to Settings > Storage management. + You need at least 500 MB free to run a Memory test. To free up memory, close tabs and apps. You need at least 625 MB of available memory to run the CPU test. To free up memory, close tabs and apps. @@ -3094,17 +3107,23 @@ Create with AI + + Create background with AI + Powered by Google AI - Use a template + Use a theme Recent wallpapers powered by Google AI + + Camera Background + - Recent camera backgrounds powered by Google AI + Recent backgrounds powered by Google AI @@ -3120,7 +3139,7 @@ Wallpaper powered by Google AI - Camera background powered by Google AI + Background powered by Google AI @@ -3135,9 +3154,15 @@ About wallpaper + + About background + This wallpaper was created with AI using the following text: "$1A radiant pink garden rose in bloom." + + This background was created with AI using the following text: "$1A radiant pink garden rose in bloom." + Created on $1Aug 25, 2023 @@ -3151,7 +3176,7 @@ No internet. Connect to the internet and try again. - We're at capacity. Please come back in a bit. + At capacity right now. Come back soon. Something went wrong. Try again. @@ -3183,6 +3208,52 @@ +$110 more + + More options + + + Menu + + + Customize AI prompt + + + Feedback + + + Good suggestion + + + Bad suggestion + + + Image set as wallpaper + + + Image set as camera background + + + Select "Create" to create an image with AI. + All created images will automatically appear here. + + + How to create with AI and a few things to keep in mind + + + Choose a theme and then select the underlined words to personalize your AI images. + <br> + <br> + Select "Inspire me" to get more unique and varied AI images options. + <br> + <br> + When you create with AI, the prompt is sent to Google AI servers to generate images and improve the product, subject to <a target="_blank" href="https://policies.google.com/privacy">Google's Privacy Policy</a>. + <br> + <br> + Generative AI is experimental, in early development, and currently has limited availability. + + + Got it + @@ -3245,7 +3316,7 @@ Airbrushed - A radiant $1pink $2orchid in bloom + A radiant $1pink $2orchid pink @@ -3274,33 +3345,30 @@ orchid - - calla lily - - - windflower - tulip - - lily of the valley - bird of paradise garden rose - - ranunculus - daisy hydrangea + + succulent + + + dried feather grass + + + cactus flower + Classic art @@ -3383,9 +3451,6 @@ art nouveau - - baroque - bauhaus @@ -3398,9 +3463,6 @@ abstract - - pointillist - graphic design @@ -3438,9 +3500,6 @@ bioluminescent beach - - firefly forest - different planet @@ -3514,18 +3573,12 @@ bridge - - lighthouse - pagoda palace - - tower - chair @@ -3584,7 +3637,7 @@ amethyst - lapis luzuli + lapis lazuli obsidian @@ -3935,6 +3988,27 @@ A $1minimal bookshelf in a $2neutral room + + minimal + + + zen + + + modern + + + magical + + + neutral + + + dark + + + light + Stylish office @@ -3942,6 +4016,30 @@ A $1modern office with $2neutral tones + + modern + + + creative + + + traditional + + + futuristic + + + neutral + + + dark + + + colorful + + + earthy + Terrain @@ -3949,6 +4047,78 @@ $1salt lake in shades of $2pink + + salt lake + + + glacial river + + + northern lights + + + sand dunes + + + clay hills + + + sandy lagoon + + + mountains + + + bioluminescent beach + + + firefly forest + + + different planet + + + tree tunnel + + + baobab trees + + + misty forest + + + cactus forest + + + pink + + + cyan + + + white + + + purple + + + blue + + + yellow + + + maroon and pink + + + blue and purple + + + pink and yellow + + + blue and pink + Cafe @@ -3956,6 +4126,36 @@ A $1cozy $2cottage cafe + + cozy + + + neutral + + + distressed + + + classic + + + romantic + + + cottage + + + modern + + + tea house + + + high tea + + + outdoor + Classic art @@ -3963,6 +4163,114 @@ A painting of a $1field of flowers in the $2avant-garde style + + field of flowers + + + swamp + + + beach + + + meadow + + + forest + + + glacier + + + tropical island + + + jungle + + + lake + + + cliff + + + vast ocean + + + river + + + sand dune + + + mountain + + + valley + + + waterfall + + + canyon + + + cityscape + + + village + + + avant-garde + + + realist + + + expressionist + + + impressionist + + + post-impressionist + + + art nouveau + + + baroque + + + bauhaus + + + classicist + + + watercolor + + + abstract + + + pointillist + + + graphic design + + + modern art + + + anime + + + pixel art + + + cyberpunk + Dreamscapes @@ -3970,6 +4278,129 @@ A surreal $1bicycle made of $2flowers in $3pink and purple + + bicycle + + + castle + + + building + + + boat + + + lamp + + + table + + + bridge + + + lighthouse + + + pagoda + + + palace + + + tower + + + chair + + + flowers + + + silk + + + felt + + + burlap + + + chiffon + + + cotton + + + fur + + + lace + + + linen + + + organza + + + tulle + + + wool + + + yarn + + + fleece + + + clay + + + stone + + + wood + + + amethyst + + + lapis luzuli + + + obsidian + + + opal + + + sapphire + + + pink and purple + + + coral and tan + + + cream and orange + + + blue and indigo + + + green and teal + + + burgundy and maroon + + + yellow and teal + Characters @@ -3977,6 +4408,237 @@ $1pink $2lemons on a $3purple background + + pink + + + yellow + + + red + + + blue + + + indigo + + + green + + + cyan + + + purple + + + brown + + + gold + + + rust + + + olive + + + gray + + + white + + + beige + + + magenta + + + neon green + + + light blue + + + neon pink + + + coral pink + + + lemons + + + flowers + + + apples + + + cherries + + + oranges + + + pineapples + + + strawberries + + + watermelons + + + potatoes + + + sushi + + + bacon and eggs + + + pizza + + + hot dogs + + + hamburgers + + + ramen + + + tacos + + + bunnies + + + cats + + + dogs + + + koalas + + + pandas + + + penguins + + + pigs + + + sloths + + + ponies + + + elephants + + + foxes + + + owls + + + crabs + + + bees + + + butterflies + + + bicycles + + + boats + + + books + + + cutlery + + + umbrellas + + + instruments + + + purple + + + blue + + + indigo + + + green + + + cyan + + + brown + + + gold + + + red + + + rust + + + olive + + + pink + + + gray + + + yellow + + + white + + + beige + + + magenta + + + neon green + + + light blue + + + neon pink + + + coral pink + Glowscapes @@ -3984,6 +4646,36 @@ A $1valley with a glowing $2river + + valley + + + hot spring + + + meadow + + + coral reef + + + pond + + + river + + + salt rock + + + flower + + + walkway + + + pool + @@ -4064,6 +4756,9 @@ Data is measured by your Thoriumbook. This may be different from provider data. + + If the last day of the month is before this day, data will be reset on the last day of the month + @@ -4822,7 +5517,7 @@ OK - Updating firmware on $1Logitech keyboard + Updating $1Logitech keyboard Your $1Logitech keyboard is now up to date @@ -4851,7 +5546,7 @@ Restarting... - + Paused ($194% complete) @@ -4869,34 +5564,32 @@ To proceed with the update, click Next. - + This update is provided by the external device manufacturer and hasn't been verified by Google. - + Warning - - - Please unplug and then re-insert the device USB cable to continue the update process. + + Unplug the $1Logitech keyboard USB cable and then reinsert it to continue the update process - - Please unplug the device USB cable to continue the update process. + + Unplug the $1Logitech keyboard USB cable to continue the update process - - Please re-insert the device USB cable to continue the update process. + + Reinsert the $1Logitech keyboard USB cable to continue the update process - - Press unlock on the device to continue the update process. + + Unlock the $1Logitech keyboard to continue the update process - - Do not turn off your computer or remove the AC adapter while the update is in progress. + + Do not turn off your $1Thoriumbook or unplug the $1Thoriumbook power cable while the update is in progress - - Unplug and replug the device to continue the update process. + + Unplug and replug the $1Logitech keyboard to continue the update process - - - Please unplug and then re-insert the device power cable to continue the update process. + + Unplug and replug the $1Logitech keyboard power cable to continue the update process @@ -5465,7 +6158,7 @@ Create new APN - Discover more APNs + Show known APNs Manage network APN settings. APNs establish a connection between a cellular network and the internet. @@ -5479,6 +6172,9 @@ You are not connected yet. If your mobile carrier recommends a custom APN, enter the APN information by selecting "+ New APN" + + You are not connected yet. If your mobile carrier recommends a custom APN, <a href="#" >enter the APN information.</a> + Can’t connect to this network using automatically detected APNs. Contact your mobile carrier for more information. @@ -5623,20 +6319,23 @@ Done - - Choose from available APNs + + Choose an APN - - Invalid APNs could cause your mobile connection to be disabled. Only set APNs provided by your mobile provider or administrator. + + Make sure to select APNs provided by your mobile provider or administrator. Selecting an APN will disable any custom APNs. Invalid APNs may disrupt your mobile connection. - - Use this APN + + Make sure to select APNs provided by your mobile provider or administrator. Selecting an APN will disable any custom APNs. Invalid APNs may disrupt your mobile connection. <a href="$1" target="_blank">Learn more</a> - - Use this APN is now enabled + + Confirm - - Use this APN is now disabled + + Confirm button is now enabled + + + Confirm button is now disabled Selected @@ -5677,89 +6376,118 @@ Move the blue touch point to an action. Select the associated key to customize. - - + Create control - + Place control on game action to play with your keyboard - + Assign a keyboard key - + Assigned keyboard key - + Select your control type - + Delete - + + Button options + + Place controls on game actions to play with keyboard keys - + Button - + Joystick - + $1Button $2w - + Unassigned $1Button - + + Selected key is $1w. $2assign_instruction + + + Key is missing. $1reassign_instruction + + + Selected key is $1w for $2up. $3reassign_instruction + + + Key is missing for $1up. $2assign_instruction + + + Tap on a keyboard key to assign + + Tap on another keyboard key to replace - - Selected key is $1w. $2reassign_instruction + + up - - Key is missing. Tap on a keyboard key to assign + + left - + + down + + + right + + Done - - Tap on the button to focus on the label + + Tap on the button to focus on the key assignment - + Use arrow keys to move this control to the game action you want. Use the enter key to place the control. Use the escape key to cancel. - + + Controls panel + + Create first control - + Create another control - + Quickly switch keys - + Reassign by selecting a new key - + Controls - + Get help - + Done editing - + Selected key is $1w. Tap on the button to edit the control - - Selected key are $1w, a, s, d. Tap on the button to edit the control + + Selected joystick keys are $1w, a, s, d. Tap on the button to edit the control - + + Edit and delete menu + + Edit $1Button w - + Delete $1Button w @@ -5807,6 +6535,11 @@ Please wait while this application is being updated + + Suspicious files will be scanned automatically by Google Safe Browsing as part of the enhanced protection you chose + + diff --git a/src/components/autofill_payments_strings.grdp b/src/components/autofill_payments_strings.grdp index 7d60261b..0e504a49 100644 --- a/src/components/autofill_payments_strings.grdp +++ b/src/components/autofill_payments_strings.grdp @@ -158,12 +158,6 @@ - - Save card securely - - - Save card? - Save card? @@ -205,12 +199,6 @@ To pay faster next time, save your card and billing address in your Google Account - - It’ll be encrypted, saved securely and the CVC is never stored. - - - Pay faster next time and protect your card with Google’s industry-leading security. - To pay faster next time, save your card, name, and billing address in your Google Account @@ -261,6 +249,9 @@ Thorium is offering to save your cards in your Google Account because you are signed in. You can change this behavior in settings. The cardholder name comes from your account. + + Saving card info + @@ -436,6 +427,9 @@ New card? BEGIN_LINKEnter Card DetailsEND_LINK + + Didn't receive your code? BEGIN_LINKGet new codeEND_LINK + Expiration Date @@ -696,7 +690,7 @@ Save IBAN to Google Account? - To pay faster next time, save your IBAN to your Google Account + To autofill this IBAN next time, save it in your Google account @@ -748,22 +742,6 @@ Add virtual card - - {NUM_CARDS, plural, - =1 {Use a virtual number for this card} - other {Select a card}} - - - {NUM_CARDS, plural, - =1 {This card will be charged when you pay, but its real number won't be shared with this site. For extra security, a temporary CVC will be generated.} - other {The card you select will be charged when you pay, but its real number won't be shared with this site. For extra security, a temporary CVC will be generated.}} - - - Continue - - - Cancel - Virtual card details @@ -840,6 +818,9 @@ Virtual card + + Turning on virtual card + $1Visa **** 1234, virtual card @@ -877,6 +858,18 @@ CVC for virtual card + + Virtual card number: + + + Expiration date: + + + Name on card: + + + Merchant doesn't accept this virtual card + Choose how you'll verify it's you @@ -944,11 +937,20 @@ Continue + + Card number: + $15% cashback on travel (terms apply) + + Now you can see card benefits before you pay + + + Now you can see card benefits before you pay + @@ -1016,12 +1018,15 @@ Cancel - + Delete card - + + Delete IBAN + + This payment method will be deleted from this device @@ -1038,9 +1043,12 @@ - + Add IBAN + + Edit IBAN + @@ -1048,25 +1056,25 @@ Manage payment methods - + Autofill payment info - + Continue - + Payment methods available to be filled on touch. Keyboard hidden. - + Payment methods available to be filled on touch opened at half height. - + Payment methods available to be filled on touch opened at full height. - + List of payment methods is closed. - + %1$sCard info, %2$s2 of %3$s8. @@ -1091,6 +1099,9 @@ Save security codes + + Save security codes, no security codes currently saved + Check out faster when your CVCs are saved @@ -1103,7 +1114,7 @@ Card benefits - See info that helps you choose which card to pay with. <a href="#">Learn about card benefits</a> + Show which rewards and benefits are available for your cards at checkout <a href="#" aria-description="$1">Learn about card benefits</a> Delete saved security codes? @@ -1114,11 +1125,11 @@ CVC saved - - Card benefits available - - See terms here + See card benefit terms + + + See terms here for $1 @@ -1170,8 +1181,14 @@ Your bank can't offer virtual cards for this payment method right now, but you can still use your $1Visa **4444 to pay online. - + Got it + + Confirming card info can't be saved + + + Confirming virtual card can't be turned on + diff --git a/src/components/autofill_strings.grdp b/src/components/autofill_strings.grdp index ded05b53..f2ec422f 100644 --- a/src/components/autofill_strings.grdp +++ b/src/components/autofill_strings.grdp @@ -1,16 +1,10 @@ - - - Clear form - - - - - Clear Form - - + + + Clear Form + @@ -93,6 +87,9 @@ China UnionPay + + Verve + Visa @@ -103,7 +100,7 @@ , ''' - + Address test data @@ -130,6 +127,7 @@ The delete address option was selected + The autofilled info was cleared from the form @@ -241,12 +239,11 @@ You can now use addresses from your Google Account - - - Right click to fill your saved info in any online form with less typing + + Right click to autofill saved info, like your name or address, on any form - Right click to fill in your saved info in any online form with less typing + Right click to autofill saved info, like your name or address, on any form @@ -365,12 +362,6 @@ - - Screen lock - - - Use screen lock to confirm cards faster - Enter $1ZIP code @@ -400,19 +391,19 @@ - + Default - + Use other providers - + Use Google Password Manager and Thorium Autofill to save and fill passwords, passkeys, payment methods, and addresses - + Use password managers and autofill services that are turned on in Android Settings @@ -578,6 +569,9 @@ Fill your address with less typing + + Add address + You don't have any addresses saved. Add an address to use it in Thorium. @@ -617,6 +611,12 @@ Submenu available, use $1right key to navigate to additional options. + + Password saved to this device + + + To save and use this password on all your devices, verify it's you + diff --git a/src/components/error_page_strings.grdp b/src/components/error_page_strings.grdp index 6a76821f..390ca026 100644 --- a/src/components/error_page_strings.grdp +++ b/src/components/error_page_strings.grdp @@ -93,7 +93,7 @@ - <a href="#buttons" onclick="javascript:portalSignin()">Signing in</a> to the WiFi network + <a href="javascript:portalSignin()">Signing in</a> to the WiFi network diff --git a/src/components/management_strings.grdp b/src/components/management_strings.grdp index 18fe77ba..45fe1633 100644 --- a/src/components/management_strings.grdp +++ b/src/components/management_strings.grdp @@ -64,7 +64,7 @@ - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Thorium. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + Your administrator can make changes to your profile and browser remotely, analyze information about the browser through reporting, and perform other necessary tasks. Activity on this device may also be managed outside of Thorium. <a target="_blank" href="$1" aria-label="$2">Learn more</a> This browser is not managed by a company or other organization. Activity on this device may be managed outside of Thorium. <a target="_blank" href="$1" aria-label="$2">Learn more</a> @@ -72,12 +72,15 @@ - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Thorium. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + Your administrator can make changes to your profile and browser remotely, analyze information about the browser through reporting, and perform other necessary tasks. Activity on this device may also be managed outside of Thorium. <a target="_blank" href="$1" aria-label="$2">Learn more</a> This browser is not managed by a company or other organization. Activity on this device may be managed outside of Thorium. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + + The profile you’re signed in to is a managed profile. Your administrator can make changes to your profile settings remotely, analyze information about the browser through reporting, and perform other necessary tasks. <a target="_blank" href="$1" aria-label="$2">Learn more</a> + Learn more about how your browser is managed @@ -284,6 +287,29 @@ A limited list of URLs of pages you visit where <a target="_blank" href="https://chromestatus.com/features#browsers.chrome.status%3A%22Deprecated%22" >legacy technology events</a> are occuring. + + + + + Managed profile, browser, and some device information is accessible to your administrator. They can see information such as the following: + + + Work profile overview + + + Work profile information (such as your work profile username) + + + Browser and device OS information (such as the browser & OS versions) + + + Installed apps & extensions in your work profile + + + Applied browser policies in your work profile + + + Thorium Enterprise Connectors @@ -343,7 +369,7 @@ Applications authorized by your administrator can capture all screens attached to your device. This information can be processed locally or uploaded to your organization’s servers. - When security events are flagged by Thorium, relevant data about the events is sent to your administrator. This can include URLs of pages you visit in Thorium, file names or metadata, browser or tab crashes, and the username that you use to sign in to web based applications, your device and Thorium. + When security events are flagged by Thorium, relevant data about the events is sent to your administrator. This can include URLs of pages you visit in Thorium, URLs of pages you copied data from, file names or metadata, browser or tab crashes, and the username that you use to sign in to web based applications, your device and Thorium. URLs of pages you visit are sent to Google Cloud or third parties for analysis. For example, they might be scanned to detect unsafe websites or filter websites based on rules set by the administrator. diff --git a/src/components/new_or_sad_tab_strings.grdp b/src/components/new_or_sad_tab_strings.grdp index 304bb8b9..675fd50b 100644 --- a/src/components/new_or_sad_tab_strings.grdp +++ b/src/components/new_or_sad_tab_strings.grdp @@ -234,67 +234,4 @@ - - - - - Incognito in Thorium - - - - - Incognito in Thorium - - - - What Incognito does - - - - When you close all Thorium Incognito tabs, your activity in those tabs is removed from this device: - <ul> - <li>Browsing activity</li> - <li>Search history</li> - <li>Information entered in forms</li> - </ul> - - - - - When you close all Thorium Incognito tabs, your activity in those tabs is removed from this device: - <ul> - <li>Browsing activity</li> - <li>Search history</li> - <li>Information entered in forms</li> - </ul> - - - - What Incognito doesn’t do - - - Incognito does not make you invisible online: - <ul> - <li>Sites and the services they use can see visits</li> - <li>Employers or schools can track browsing activity</li> - <li>Internet service providers can monitor web traffic</li> - </ul> - - - - <a>Learn more about Incognito in Thorium</a> - - - - - <a>Learn more about Incognito in Thorium</a> - - - - Block third party cookies in Incognito - - - Sites can't use cookies that track you across the web. Features on some sites may break. - - diff --git a/src/components/page_info_strings.grdp b/src/components/page_info_strings.grdp index 81873e74..2c3cc48a 100644 --- a/src/components/page_info_strings.grdp +++ b/src/components/page_info_strings.grdp @@ -144,7 +144,7 @@ - + You have chosen to turn off security warnings for this site. @@ -180,9 +180,6 @@ The connection is encrypted and authenticated using $1AES_128_GCM and uses $2RSA as the key exchange mechanism. - - The identity of the server you are connected to cannot be fully validated. You are connected to a server using a name only valid within your network, which an external certificate authority has no way to validate ownership of. As some certificate authorities will issue certificates for these names regardless, there is no way to ensure you are connected to the intended website and not an attacker. - Your connection to $1www.google.com is not encrypted. @@ -403,6 +400,9 @@ Can ask to use your camera + + Can ask to scroll and zoom shared tabs + Can ask to use & move your camera @@ -742,13 +742,13 @@ Tracking Protection - + Third-party cookies allowed Third-party cookies blocked - + Third-party cookies limited @@ -834,6 +834,12 @@ This site is flagged by your organization + Your organization has flagged this site as it might violate a policy. + + + This site is blocked by your organization + + Your organization has blocked this site because it violates a policy. diff --git a/src/components/security_interstitials_strings.grdp b/src/components/security_interstitials_strings.grdp index a31d862a..ff552bd0 100644 --- a/src/components/security_interstitials_strings.grdp +++ b/src/components/security_interstitials_strings.grdp @@ -246,143 +246,58 @@ Back to safety - + Dangerous site - - - The site ahead contains dangerous apps - - - - - The site ahead contains malware - - - - - - Attackers currently on <strong>$1example.com</strong> could install dangerous apps that damage your device, add hidden charges to your mobile bill, or steal your personal information. <a href="#" id="learn-more-link">Learn more</a> - - - - - Attackers currently on <strong>$1example.com</strong> might attempt to install dangerous programs on your Mac that steal or delete your information (for example, photos, passwords, messages, and credit cards). <a href="#" id="learn-more-link">Learn more</a> - - - - - Attackers currently on <strong>$1example.com</strong> might attempt to install dangerous programs on your computer that steal or delete your information (for example, photos, passwords, messages, and credit cards). <a href="#" id="learn-more-link">Learn more</a> - - - - Google Safe Browsing recently <a href="#" id="diagnostic-link">detected malware</a> on $1example.com. Websites that are normally safe are sometimes infected with malware. - - - Google Safe Browsing recently <a href="#" id="diagnostic-link">detected malware</a> on $1example.com. Websites that are normally safe are sometimes infected with malware. The malicious content comes from $2evil.com, a known malware distributor. - - - If you understand the risks to your security, you may <a href="#" id="proceed-link">visit this unsafe site</a> before the dangerous programs have been removed. - - + Attackers on the site you're trying to visit might install harmful software that steals or deletes things like your password, photos, messages, or credit card number. Thorium strongly recommends going back to safety. <a href="#" id="learn-more-link">Learn more</a> - + Thorium has built-in safety features to protect you while you browse — like Google Safe Browsing, which <a href="#" id="diagnostic-link">recently found malware</a> on the site you're trying to visit. - + Thorium has built-in safety features to protect you while you browse, like Google Safe Browsing. Safe Browsing <a href="#" id="diagnostic-link">recently found malware on $1example.com</a>, which is embedded in the site you're trying to visit. - + Even sites that are normally safe are sometimes compromised by attackers. Only visit <a href="#" id="proceed-link">this unsafe site</a> if you're sure you understand the risks. Help improve security on the web for everyone by sending <a href="#" id="whitepaper-link">URLs of some pages you visit, limited system information, and some page content</a> to Google. <a id="privacy-link" href="#">Privacy policy</a> - To get Thorium’s highest level of security, <a href="#" id="enhanced-protection-link">turn on enhanced protection</a> - - <a href="#" id="enhanced-protection-link">Turn on enhanced protection</a> to get Thorium's highest level of security - - - The site ahead contains harmful apps - - - - Attackers on <strong>$1example.com</strong> could install deceptive apps that pretend to be something else or collect data that may be used to track you. <a href="#" id="learn-more-link">Learn more</a> - - - - Google Safe Browsing recently <a href="#" id="diagnostic-link">found harmful apps</a> on $1example.com. - - - - If you understand the risks to your security, you may <a href="#" id="proceed-link">visit this site</a> before the harmful apps have been removed. - - - - - The site ahead contains harmful programs - - - - Attackers on <strong>$1example.com</strong> might attempt to trick you into installing programs that harm your browsing experience (for example, by changing your homepage or showing extra ads on sites you visit). <a href="#" id="learn-more-link">Learn more</a> - - - - Google Safe Browsing recently <a href="#" id="diagnostic-link">found harmful programs</a> on $1example.com. - - - - If you understand the risks to your security, you may <a href="#" id="proceed-link">visit this site</a> before the harmful programs have been removed. - - - - + Attackers on the site you're trying to visit might trick you into installing harmful software that affects the way you browse — for example, by changing your homepage or showing you extra ads on sites you visit. Thorium strongly recommends going back to safety to avoid harm. <a href="#" id="learn-more-link">Learn more</a> - + Thorium has built-in safety features to protect you while you browse — like Google Safe Browsing, which recently <a href="#" id="diagnostic-link">found harmful software</a> on the site you're trying to visit. - + Thorium has built-in safety features to protect you while you browse, like Google Safe Browsing. Safe Browsing recently <a href="#" id="diagnostic-link">found harmful software on $1example.com</a>, which is embedded in the site if you're trying to visit. - + Even sites that are normally safe are sometimes compromised by attackers. Only visit <a href="#" id="proceed-link">this unsafe site</a> if you're sure you understand the risks. - - Deceptive site ahead - - Attackers on <strong>$1example.com</strong> may trick you into doing something dangerous like installing software or revealing your personal information (for example, passwords, phone numbers, or credit cards). <a href="#" id="learn-more-link">Learn more</a> - - - Google Safe Browsing recently <a href="#" id="diagnostic-link">detected phishing</a> on $1example.com. Phishing sites pretend to be other websites to trick you. - - - You can <a href="#" id="report-error-link">report a detection problem</a> or, if you understand the risks to your security, <a href="#" id="proceed-link">visit this unsafe site</a>. - - Attackers on the site you're trying to visit might trick you into installing software or revealing things like your password, phone, or credit card number. Thorium strongly recommends going back to safety. <a href="#" id="learn-more-link">Learn more</a> - + Thorium has built-in safety features to protect you while you browse — like Google Safe Browsing, which <a href="#" id="diagnostic-link">recently found phishing</a> on the site you're trying to visit. Phishing sites pretend to be other sites to trick you.<br/><br/>Even sites that are normally safe are sometimes compromised by attackers. <a href="#" id="report-error-link">Let us know</a> if you think there's been a mistake and that this site doesn't pose a danger. - + Thorium has built-in safety features to protect you while you browse, like Google Safe Browsing. Safe Browsing recently <a href="#" id="diagnostic-link">found phishing on $1example.com</a>, which is embedded in the site you're trying to visit.<br/><br/>Even sites that are normally safe are sometimes compromised by attackers. <a href="#" id="report-error-link">Let us know</a> if you think there's been a mistake and that this site doesn't pose a danger. - + Only visit <a href="#" id="proceed-link">this unsafe site</a> if you're sure you understand the risks. diff --git a/src/components/ssl_errors_strings.grdp b/src/components/ssl_errors_strings.grdp index 2f97b988..3055ab31 100644 --- a/src/components/ssl_errors_strings.grdp +++ b/src/components/ssl_errors_strings.grdp @@ -102,6 +102,13 @@ The server certificate has a validity period that is too long. + + You attempted to reach <strong>$1paypal.com</strong>, but the server presented an invalid certificate issued to that name. The name is a reserved IP address or internal hostname. + + + The server certificate is issued to a non-unique name. + + An unknown error has occurred. diff --git a/src/services/preferences/tracked/tracked_split_preference.cc b/src/services/preferences/tracked/tracked_split_preference.cc new file mode 100644 index 00000000..9377fedb --- /dev/null +++ b/src/services/preferences/tracked/tracked_split_preference.cc @@ -0,0 +1,127 @@ +// Copyright 2024 The Chromium Authors, win32ss, and Alex313031 +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "services/preferences/tracked/tracked_split_preference.h" + +#include + +#include "base/check.h" +#include "base/command_line.h" +#include "base/notreached.h" +#include "base/values.h" +#include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom.h" +#include "services/preferences/tracked/pref_hash_store_transaction.h" + +using ValueState = + prefs::mojom::TrackedPreferenceValidationDelegate::ValueState; + +TrackedSplitPreference::TrackedSplitPreference( + const std::string& pref_path, + size_t reporting_id, + size_t reporting_ids_count, + prefs::mojom::TrackedPreferenceMetadata::EnforcementLevel enforcement_level, + prefs::mojom::TrackedPreferenceMetadata::ValueType value_type, + prefs::mojom::TrackedPreferenceValidationDelegate* delegate) + : pref_path_(pref_path), + helper_(pref_path, + reporting_id, + reporting_ids_count, + enforcement_level, + value_type), + delegate_(delegate) {} + +TrackedPreferenceType TrackedSplitPreference::GetType() const { + return TrackedPreferenceType::SPLIT; +} + +void TrackedSplitPreference::OnNewValue( + const base::Value* value, + PrefHashStoreTransaction* transaction) const { + if (value && !value->is_dict()) { + NOTREACHED(); + return; + } + + transaction->StoreSplitHash(pref_path_, value ? &value->GetDict() : nullptr); +} + +bool TrackedSplitPreference::EnforceAndReport( + base::Value::Dict& pref_store_contents, + PrefHashStoreTransaction* transaction, + PrefHashStoreTransaction* external_validation_transaction) const { + bool was_reset = false; + base::Value* value = pref_store_contents.FindByDottedPath(pref_path_); + if (value && !value->is_dict()) { + // There should be a dictionary or nothing at |pref_path_|. If we have a + // non-dictionary here, reset it as it's an unexpected type. Then treat it + // as if it was never present. See https://crbug.com/1512724. + CHECK(pref_store_contents.RemoveByDottedPath(pref_path_)); + was_reset = true; + value = nullptr; + } + + base::Value::Dict* dict_value = value ? &value->GetDict() : nullptr; + + std::vector invalid_keys; + ValueState value_state = + transaction->CheckSplitValue(pref_path_, dict_value, &invalid_keys); + + helper_.ReportValidationResult(value_state, transaction->GetStoreUMASuffix()); + + ValueState external_validation_value_state = ValueState::UNSUPPORTED; + std::vector external_validation_invalid_keys; + if (external_validation_transaction) { + external_validation_value_state = + external_validation_transaction->CheckSplitValue( + pref_path_, dict_value, &external_validation_invalid_keys); + helper_.ReportValidationResult( + external_validation_value_state, + external_validation_transaction->GetStoreUMASuffix()); + } + + if (delegate_) { + delegate_->OnSplitPreferenceValidation( + pref_path_, invalid_keys, external_validation_invalid_keys, value_state, + external_validation_value_state, helper_.IsPersonal()); + } + + TrackedPreferenceHelper::ResetAction reset_action = helper_.GetAction(value_state); + if (base::CommandLine::ForCurrentProcess()->HasSwitch("disable-machine-id") || + base::CommandLine::ForCurrentProcess()->HasSwitch("disable-encryption") || + base::CommandLine::ForCurrentProcess()->HasSwitch("revert-from-portable")) { + reset_action = TrackedPreferenceHelper::DONT_RESET; + } + + helper_.ReportAction(reset_action); + + if (reset_action == TrackedPreferenceHelper::DO_RESET) { + if (value_state == ValueState::CHANGED) { + DCHECK(!invalid_keys.empty()); + + for (std::vector::const_iterator it = invalid_keys.begin(); + it != invalid_keys.end(); ++it) { + dict_value->Remove(*it); + } + } else { + pref_store_contents.RemoveByDottedPath(pref_path_); + } + was_reset = true; + } + + if (value_state != ValueState::UNCHANGED) { + // Store the hash for the new value (whether it was reset or not). + transaction->StoreSplitHash( + pref_path_, pref_store_contents.FindDictByDottedPath(pref_path_)); + } + + // Update MACs in the external store if there is one and there either was a + // reset or external validation failed. + if (external_validation_transaction && + (was_reset || external_validation_value_state != ValueState::UNCHANGED)) { + external_validation_transaction->StoreSplitHash( + pref_path_, pref_store_contents.FindDictByDottedPath(pref_path_)); + } + + return was_reset; +} diff --git a/src/ui/chromeos/ui_chromeos_strings.grd b/src/ui/chromeos/ui_chromeos_strings.grd index 746d6aea..260a9a94 100644 --- a/src/ui/chromeos/ui_chromeos_strings.grd +++ b/src/ui/chromeos/ui_chromeos_strings.grd @@ -1422,9 +1422,6 @@ Sign in to network - - Connected, limited connectivity - Connected, no internet @@ -1836,7 +1833,7 @@ An incorrect PIN was entered too many times. - To use this network, you need to enter the 8-digit Personal Unblocking Key (PUK) provided by the carrier. + To use this network, you need to enter the 8-digit Personal Unblocking Key (PUK) provided by the carrier. You won't be able to use this network until you set up a new PIN