From 347da8e7e5682a5c9c63dca7b45b17e29a48b7d9 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Sat, 23 Nov 2024 00:12:12 -0600 Subject: [PATCH] rebase .grd files --- src/build/config/mac/BUILD.gn | 3 +- src/chrome/app/app_management_strings.grdp | 12 - src/chrome/app/chromium_strings.grd | 126 ++-- src/chrome/app/generated_resources.grd | 593 +++++++++++++----- src/chrome/app/settings_chromium_strings.grdp | 29 +- src/chrome/app/settings_strings.grdp | 329 ++++------ src/chrome/app/shared_settings_strings.grdp | 23 +- src/components/autofill_payments_strings.grdp | 64 +- src/components/autofill_strings.grdp | 47 +- src/components/management_strings.grdp | 29 +- src/components/page_info_strings.grdp | 70 ++- .../security_interstitials_strings.grdp | 21 + 12 files changed, 866 insertions(+), 480 deletions(-) diff --git a/src/build/config/mac/BUILD.gn b/src/build/config/mac/BUILD.gn index 9d60b822..67bb328a 100644 --- a/src/build/config/mac/BUILD.gn +++ b/src/build/config/mac/BUILD.gn @@ -111,8 +111,7 @@ config("mac_dynamic_flags") { # # The symbolic link for $mac_sdk_path is set up by # //build/config/apple/sdk_info.py in //build/config/mac/mac_sdk.gni. -if (use_system_xcode && (use_remoteexec || use_siso) && target_os == "mac" && - current_toolchain == default_toolchain) { +if (mac_use_xcode_symlinks && current_toolchain == default_toolchain) { action("sdk_inputs") { script = "//build/noop.py" outputs = [ diff --git a/src/chrome/app/app_management_strings.grdp b/src/chrome/app/app_management_strings.grdp index 9a41992c..15e20ccf 100644 --- a/src/chrome/app/app_management_strings.grdp +++ b/src/chrome/app/app_management_strings.grdp @@ -120,18 +120,6 @@ From $1https://google.com - - Android App - - - Thorium App - - - Web App - - - ThoriumOS System App - Chrome Web Store diff --git a/src/chrome/app/chromium_strings.grd b/src/chrome/app/chromium_strings.grd index 1d4c5029..72236ef8 100644 --- a/src/chrome/app/chromium_strings.grd +++ b/src/chrome/app/chromium_strings.grd @@ -761,6 +761,10 @@ Permissions you've already given to websites and apps may apply to this account. desc="On the downloads page, the label for the link to the help center in the prompt to bypass a dangerous download warning."> Learn why Thorium blocks some files + + Learn why Thorium blocks some files, opens in new tab + @@ -1001,9 +1005,6 @@ 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! @@ -1013,6 +1014,17 @@ Permissions you've already given to websites and apps may apply to this account. + + + Your organization manages Thorium + + + $1The Company manages Thorium + + + Multiple organizations manage Thorium + + @@ -1057,8 +1069,35 @@ Permissions you've already given to websites and apps may apply to this account. + + + + 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 + + + - Continue in a new Thorium profile? @@ -1098,6 +1137,12 @@ Permissions you've already given to websites and apps may apply to this account. While you're signed in, you can use your passwords and more from your Google Account in Thorium. $1CTRL+SHIFT+M can change your Google services settings. + + Sign out of Thorium? + + + Your passwords and other Thorium data are saved in your Google Account, and will be removed from this device. To use them in the future, sign back 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. @@ -1107,33 +1152,6 @@ Permissions you've already given to websites and apps may apply to this account. 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 - - Click to close the Thorium sign-in dialog @@ -1470,6 +1488,9 @@ Permissions you've already given to websites and apps may apply to this account. Update Thorium + + To use and save Thorium data in your Google Account, enter your passphrase + @@ -1538,6 +1559,9 @@ Permissions you've already given to websites and apps may apply to this account. Thorium needs permission to access your camera for this site + + Thorium needs permission to track your hands + Thorium needs permission to access your microphone for this site @@ -1554,12 +1578,12 @@ 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 + + Thorium needs permission to track your hands + Thorium needs microphone permission for this site @@ -1572,6 +1596,9 @@ Permissions you've already given to websites and apps may apply to this account. Thorium needs storage access permission to download files + + Thorium needs permission to map your surroundings and track your hands + @@ -1729,6 +1756,15 @@ Permissions you've already given to websites and apps may apply to this account. While we're setting up account access, you can still use Thorium. You may not be able to access some resources until setup is complete. + + + + + The Thorium settings your parent chose in Family Link can help keep you safe online + + @@ -1915,10 +1951,10 @@ Permissions you've already given to websites and apps may apply to this account. Turn on additional protection in Thorium’s JavaScript and WebAssembly engine - + V8 is Thorium’s JavaScript and WebAssembly engine used to improve site performance - + Thorium runs faster and features that use JavaScript should work as designed (recommended) @@ -2018,6 +2054,24 @@ Permissions you've already given to websites and apps may apply to this account. Extra code: $10x80071234. + + + Startup error: another instance of setup is currently running, please try again later. + + + Startup error: please run the installer as administrator. + + + Startup error: please run the installer as a regular user, not as administrator. + + + Startup error: $1error-internal. + + diff --git a/src/chrome/app/generated_resources.grd b/src/chrome/app/generated_resources.grd index 2dd13329..ae0b5889 100644 --- a/src/chrome/app/generated_resources.grd +++ b/src/chrome/app/generated_resources.grd @@ -877,6 +877,10 @@ are declared in tools/grit/grit_rule.gni. Fill in form + + + Autocomplete + Addresses and more @@ -1210,6 +1214,10 @@ are declared in tools/grit/grit_rule.gni. Fill in Form + + + Autocomplete + Addresses and More @@ -1639,6 +1647,9 @@ are declared in tools/grit/grit_rule.gni. Name &window... + + &Toggle Compact Mode + Thorium &Labs... @@ -1689,6 +1700,9 @@ are declared in tools/grit/grit_rule.gni. Name &Window... + + &Toggle Compact Mode + Thorium &Labs... @@ -2373,6 +2387,11 @@ are declared in tools/grit/grit_rule.gni. Deleted $1file.txt from download history + + $1https://example.com copied to clipboard + + @@ -2574,6 +2593,10 @@ are declared in tools/grit/grit_rule.gni. desc="On the downloads page, the label for the button to remove a downloaded file from the history."> Delete from history + + Copy download link + @@ -2667,6 +2690,27 @@ are declared in tools/grit/grit_rule.gni. desc="On the downloads page, the accept risk survey option in the interstitial to bypass a dangerous download warning."> I'm willing to accept the risk + + + Tell us why you're downloading this file anyway survey + + + I created this file, radio button group, 1 of 3 + + + I trust the site, radio button group, 2 of 3 + + + I trust the site ($1https://example.com), radio button group, 2 of 3 + + + I'm willing to accept the risk, radio button group, 3 of 3 + - - - Always open in Adobe Reader - - Scan file @@ -4733,6 +4771,12 @@ are declared in tools/grit/grit_rule.gni. Learn More + + Opt Out + + + Opting out of process sharing requires a browser restart. This browser will restart now. + @@ -5369,7 +5413,7 @@ are declared in tools/grit/grit_rule.gni. Open in Web Store - + Read and change all your data on your computer and all websites @@ -6563,6 +6607,9 @@ Keep your key file in a safe place. You will need it to create new versions of y These extensions don't need to see and change information on this site. + + Allow extensions on $1google.com + Extensions allowed on this site @@ -6570,13 +6617,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Extensions are not allowed on this site - Allow extensions on this site - - - Select to block all extensions on this site - - - Select to allow extensions on this site + Allow extensions No extensions need access to this site @@ -6638,8 +6679,8 @@ Keep your key file in a safe place. You will need it to create new versions of y No access needed - - Chrome Web Store + + Discover more extensions Change site permissions @@ -7035,18 +7076,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Use suggested password - - Use recommended password - - - Use a safer password - - - Try a new password - - - Quickly use a strong password - Choose your own @@ -7064,18 +7093,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Use Suggested Password - - Use Recommended Password - - - Use a Safer Password - - - Try a New Password - - - Quickly Use a Strong Password - Choose Your Own @@ -7166,36 +7183,9 @@ Keep your key file in a safe place. You will need it to create new versions of y You won't need to remember this password. It will be saved to $1Google Password Manager for $2user@gmail.com. - - Keep this account more secure with a strong password. It will be saved to $1Google Password Manager for $2user@gmail.com. - - - Stay safer online with a strong password. It will be saved to $1Google Password Manager for $2user@gmail.com. - - - You can always change this password later. It will be saved to $1Google Password Manager for $2user@gmail.com. - - - Sign up and sign in faster when your password is automatically saved to $1Google Password Manager for $2user@gmail.com. - Google Password Manager created a strong password for this website - - When you use and save this password: - - - It's available on any device - - - It's protected by the best of Google - - - You'll be notified if it's ever at risk - - - It will be saved to $1Google Password Manager for $2user@gmail.com. - Passwords are saved to $1Google Password Manager. @@ -7710,7 +7700,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Why this suggestion? - + Close @@ -7762,6 +7752,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Your Google Lens selection. Press enter or backspace to delete your Google Lens selection + + Search + Add shortcut @@ -7912,6 +7905,9 @@ Keep your key file in a safe place. You will need it to create new versions of y $1ZomboCom is managing your new tab page + + $1ZomboCom is managing your new tab page, opens in a new tab + Reset to Default Thorium @@ -8263,7 +8259,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Interiors - + Landscape @@ -8491,7 +8487,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Creative - + Dark @@ -8512,7 +8508,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Romantic - + Serene @@ -8560,6 +8556,12 @@ Keep your key file in a safe place. You will need it to create new versions of y A large wave engulfs the ocean, with a dark forest ashore. + + , ''' + + + Customize toolbar buttons + Choose what buttons show in the toolbar @@ -8629,6 +8631,9 @@ Keep your key file in a safe place. You will need it to create new versions of y More actions for $1shopping suggestions + + More actions + Customize cards @@ -8689,8 +8694,8 @@ 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. - - Hide Google Calendar + + Hide for $15 hours Google Calendar hidden @@ -8984,6 +8989,21 @@ Keep your key file in a safe place. You will need it to create new versions of y Side Panel Resize Handle + + Close side panel + + + $1left window now $260% wide, $3right pane now $440% wide. + + + Left + + + Right + Side Panel Selector @@ -9076,8 +9096,23 @@ Keep your key file in a safe place. You will need it to create new versions of y is_accessibility_with_no_ui="true"> Pinned! You can access Google Lens again from the new button on the toolbar + + More info + + + + Save to a folder in your Google Account? + + + + This bookmark is saved only on this device. You can save it in your Google Account. + + + + Save in account + Sort by $1Newest @@ -9358,6 +9393,24 @@ Keep your key file in a safe place. You will need it to create new versions of y Blue + + Voice highlight + + + Auto + + + Word + + + Phrase + + + Sentence + + + Off + Getting ready @@ -9374,10 +9427,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Listen to the text with natural voice - Play keyboard shortcut k - - - Pause keyboard shortcut k + Play / pause, keyboard shortcut k Play (k) @@ -9671,6 +9721,17 @@ Keep your key file in a safe place. You will need it to create new versions of y Search tabs + + + Close unused tabs? + + + Close unused tabs? + + + Close unused tabs + + Organize tabs? @@ -9791,7 +9852,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - + @@ -9825,7 +9886,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - + @@ -9859,6 +9920,40 @@ Keep your key file in a safe place. You will need it to create new versions of y + + + + + + Your Card Is Saved + + + Use This Card On Your iPhone + + + No Thanks + + + + + Your card is saved + + + Use this card on your iPhone + + + No thanks + + + + You can access it in your Payment Methods + + + Download Thorium with this QR code, and sign in to your Google Account. + + + + $1 (Incognito) @@ -10619,7 +10714,7 @@ Check your passwords anytime in $1Google No saved passwords for $1example.com - + Saved passwords for $1example.com @@ -11135,8 +11230,8 @@ Check your passwords anytime in $1Google Organize similar tabs - - Show specifications + + Compare tabs @@ -11233,8 +11328,8 @@ Check your passwords anytime in $1Google Organize Similar Tabs - - Show specifications + + Compare Tabs @@ -11457,10 +11552,10 @@ Check your passwords anytime in $1Google Tab group name: $1My tab group - + Edit group name $1My tab group - + Remove group $1My tab group @@ -11469,6 +11564,27 @@ Check your passwords anytime in $1Google Thumbs up submits feedback that you like this tab group suggestion + + Group tabs + + + Check for suggestions + + + {NUM_TABS, plural, + =0 {No unused tabs} + =1 {Close 1 unused tab} + other {Close # unused tabs}} + + + Review and decide + + + Close unused tabs + + + These tabs have been unused for $17 or more days. + @@ -11583,22 +11699,16 @@ Check your passwords anytime in $1Google other {Ungroup Tab Groups?}} - {TAB_COUNT, plural, - =1 {{GROUP_COUNT, plural, - =1 {Close Tab and Delete Group?} - other {Close Tab and Delete Groups?}}} - other {{GROUP_COUNT, plural, - =1 {Close Tabs and Delete Group?} - other {Close Tabs and Delete Groups?}}}} + {MULTI_GROUP_TAB_COUNT, plural, + =0 {Close Tab and Delete Group?} + =1 {Close Tabs and Delete Group?} + other {Close Tabs and Delete Groups?}} - {TAB_COUNT, plural, - =1 {{GROUP_COUNT, plural, - =1 {Remove Tab and Delete Group?} - other {Remove Tab and Delete Groups?}}} - other {{GROUP_COUNT, plural, - =1 {Remove Tabs and Delete Group?} - other {Remove Tabs and Delete Groups?}}}} + {MULTI_GROUP_TAB_COUNT, plural, + =0 {Remove Tab and Delete Group?} + =1 {Remove Tabs and Delete Group?} + other {Remove Tabs and Delete Groups?}} @@ -11627,22 +11737,16 @@ Check your passwords anytime in $1Google other {Ungroup tab groups?}} - {TAB_COUNT, plural, - =1 {{GROUP_COUNT, plural, - =1 {Close tab and delete group?} - other {Close tab and delete groups?}}} - other {{GROUP_COUNT, plural, - =1 {Close tabs and delete group?} - other {Close tabs and delete groups?}}}} + {MULTI_GROUP_TAB_COUNT, plural, + =0 {Close tab and delete group?} + =1 {Close tabs and delete group?} + other {Close tabs and delete groups?}} - {TAB_COUNT, plural, - =1 {{GROUP_COUNT, plural, - =1 {Remove tab and delete group?} - other {Remove tab and delete groups?}}} - other {{GROUP_COUNT, plural, - =1 {Remove tabs and delete group?} - other {Remove tabs and delete groups?}}}} + {MULTI_GROUP_TAB_COUNT, plural, + =0 {Remove tab and delete group?} + =1 {Remove tabs and delete group?} + other {Remove tabs and delete groups?}} @@ -11672,6 +11776,12 @@ Check your passwords anytime in $1Google Ungroup + + Share group + + + Manage sharing + Close group @@ -11713,6 +11823,12 @@ Check your passwords anytime in $1Google Ungroup + + Share Group + + + Manage Sharing + Close Group @@ -12575,6 +12691,18 @@ Check your passwords anytime in $1Google If a site uses cookies, it will appear here + + Related installed applications + + + + A site can find out if related web applications are installed on your machine. This info is available to the site and its subdomains. + + + + Go to app settings + + Allow to save data @@ -13799,6 +13927,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Page is not in $1French + + Open language settings + Selection is not in $1French @@ -13864,6 +13995,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Page Is Not in $1French + + Open Language Settings + Selection Is Not in $1French @@ -14484,24 +14618,14 @@ Please help our engineers fix this problem. Tell us what happened right before y This site will ask again next time. - + - Location is turned off in ThoriumOS Settings + Location is turned off in system settings - - - Location is turned off in Mac System Preferences - - - - - Location is turned off in Windows System Preferences - - - - Location turned off - + + Location turned off + @@ -14582,9 +14706,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Microphone is turned off in Mac System Settings - - Open Settings - Camera @@ -14598,15 +14719,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Microphone turned off - - - Open Settings - - Turned off + + System settings + @@ -15126,6 +15245,19 @@ Please help our engineers fix this problem. Tell us what happened right before y Unnamed media source + + To share your window, use your system's window picker + + + Choose a window + + + To share your screen, use your system's screen picker + + + Choose a screen + + Allow $1 to see this tab? @@ -15420,6 +15552,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Add a query param in URL to auto-refresh the page: chrome://device-log/?refresh=<sec> + + Add a query param in the URL to select types on page load. Example: chrome://device-log/?types=Bluetooth,USB + Refresh @@ -16203,6 +16338,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Try again + + Loading... + @@ -16382,23 +16520,11 @@ Please help our engineers fix this problem. Tell us what happened right before y Your security key does not have enough space for any more accounts. - - Allow this site to see your security key? + + accounts.google.com$1 will learn the make and model of your security key - - accounts.google.com$1 wants to see the make and model of your security key - - - Allow this site to identify your security key? - - - accounts.google.com$1 issued your security key and wants to learn its ID number. The site will know exactly which security key you're using. - - - Allow - - - Skip + + accounts.google.com$1 wants to learn the ID number of your security key. The site will know exactly which security key you're using. Try again @@ -16614,6 +16740,9 @@ Please help our engineers fix this problem. Tell us what happened right before y $1example.com wants to verify it's you + + Enter PIN digit $13 of 6. Use backspace or delete to remove the last digit. + Forgot PIN @@ -16658,8 +16787,49 @@ Please help our engineers fix this problem. Tell us what happened right before y Google Password Manager - + + Passkey update needed + + + Sign in to this site to create a new passkey. The old one was deleted from Google Password Manager. + + + Manage passkeys + + + Got it + + + Passkey updated + + + You can view and manage your passkeys saved in $1Google Password Manager + + + Google Password Manager + + + Passkey deleted + + + You can view and manage your passkeys saved in $1Google Password Manager + + + Google Password Manager + + + Bluetooth is disabled + + + + Check your device settings and turn it on to continue + + + + Try again + + Retrieve credentials from phone or tablet. @@ -17231,6 +17401,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Text copied + + Image copied + More options @@ -17246,6 +17419,12 @@ Please help our engineers fix this problem. Tell us what happened right before y Select text + + Copy as image + + + Save as image + Learn more @@ -17255,6 +17434,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Select anything to search with Google Lens + + Select text with Google Lens + Google Lens is not available. Try again later. @@ -17278,10 +17460,52 @@ Please help our engineers fix this problem. Tell us what happened right before y to search anything on the page via Google Lens."> Search anything on this page + + Search any image or text with Lens + + + Select images/text to search with Lens + Google Lens + + Open Lens + + + Try Lens + + + Auto-detect + + + Translate screen + + + Translate from + + + Translate to + + + Recent languages + + + All languages + + + Detected + + + Detect language + Send feedback @@ -17296,16 +17520,16 @@ Please help our engineers fix this problem. Tell us what happened right before y Cancel - Continue + OK - - When you use Google Lens, a screenshot of the page is sent to Google. $1Learn more + + Identify things or places and copy or translate text. 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 + + New! An easy way to search what's on your screen @@ -17360,17 +17584,32 @@ Please help our engineers fix this problem. Tell us what happened right before y Choose an account + + name + + + email address + + + profile picture + + + {count, plural, + =1 {{field_1}} + =2 {{field_1} and {field_2}} + other {{field_1}, {field_2}, and {field_3}}} + - To continue, $1idp.com will share your name, email address, and profile picture with this site. + To continue, $1idp.com will share your $2name and email address with this site. - To continue, $1idp.com will share your name, email address, and profile picture with this site. See this site's $2terms of service$3. + To continue, $1idp.com will share your $2name and email address with this site. See this site's $3terms of service$4. - To continue, $1idp.com will share your name, email address, and profile picture with this site. See this site's $2privacy policy$3. + To continue, $1idp.com will share your $2name and email address with this site. See this site's $3privacy policy$4. - 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. + To continue, $1idp.com will share your $2name and email address with this site. See this site's $3privacy policy$4 and $5terms of service$6. Use a different account @@ -17806,6 +18045,26 @@ Please help our engineers fix this problem. Tell us what happened right before y Performance issue alert + + + + + Link copied + + + Image copied + + + Link copied to highlight + + + Page added to reading list + + + Open + + + Location @@ -18001,13 +18260,13 @@ Please help our engineers fix this problem. Tell us what happened right before y {NUM_SITES, plural, - =1 {Thorium removed permissions for 1 site} - other {Thorium removed permissions for {NUM_SITES} sites}} + =1 {Thorium removed permissions from 1 site} + other {Thorium removed permissions from {NUM_SITES} sites}} {NUM_SITES, plural, - =1 {Thorium removed permissions for 1 site} - other {Thorium removed permissions for {NUM_SITES} sites}} + =1 {Thorium removed permissions from 1 site} + other {Thorium removed permissions from {NUM_SITES} sites}} {NUM_SITES, plural, diff --git a/src/chrome/app/settings_chromium_strings.grdp b/src/chrome/app/settings_chromium_strings.grdp index f9a8d933..4407bf25 100644 --- a/src/chrome/app/settings_chromium_strings.grdp +++ b/src/chrome/app/settings_chromium_strings.grdp @@ -146,6 +146,24 @@ Open PDFs in Thorium + + To use your camera, give Thorium access in <a href="#" id="openSystemSettingsLink" >system settings</a></a> + + + To use your microphone, give Thorium access in <a href="#" id="openSystemSettingsLink" >system settings</a></a> + + + To use your location, give Thorium access in <a href="#" id="openSystemSettingsLink" >system settings</a></a> + + + To use your camera on these sites, give Thorium access in <a href="#" id="openSystemSettingsLink" >system settings</a></a> + + + To use your location on these sites, give Thorium access in <a href="#" id="openSystemSettingsLink" >system settings</a></a> + + + To use your microphone on these sites, give Thorium access in <a href="#" id="openSystemSettingsLink" >system settings</a></a> + @@ -337,13 +355,13 @@ - When on, Thorium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Thorium fast. Your inactive tabs automatically become active again when you go back to them. + Thorium frees up memory from inactive tabs. This gives active tabs and other apps more computer resources and keeps Thorium fast. Your inactive tabs automatically become active again when you go back to them. - When on, Thorium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates. + Thorium conserves battery power by limiting background activity and visual effects, such as smooth scrolling and video frame rates. - When on, Thorium preloads pages which makes browsing and searching faster. + Thorium preloads pages which makes browsing and searching faster. @@ -440,7 +458,10 @@ Dangerous site. Thorium removed notifications. - + + + Thorium upgrades insecure connections to HTTPS automatically when possible + Thorium will try to upgrade navigations to HTTPS diff --git a/src/chrome/app/settings_strings.grdp b/src/chrome/app/settings_strings.grdp index f1217c76..f674e925 100644 --- a/src/chrome/app/settings_strings.grdp +++ b/src/chrome/app/settings_strings.grdp @@ -60,136 +60,6 @@ Send feedback - - Get the most out of Thorium - - - Thorium makes the web work better for you - - - 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. - @@ -247,7 +117,7 @@ Live Translate - Sends captions to Google to automatically translate them + Automatically translates live captions. Captions are sent to Google for translation. @@ -261,7 +131,7 @@ Automatically creates captions for English audio and video. Audio and captions never leave your device. - Automatically creates captions for audio and video + Automatically creates captions for supported languages. Audio never leaves your device. Downloading speech recognition files... $117% @@ -673,6 +543,9 @@ This IBAN will be saved to this device only + + IBAN is invalid + Nickname @@ -718,10 +591,7 @@ Saved addresses will appear here - - Warn you if passwords are exposed in a data breach - - + Warn you if a password was compromised in a data breach @@ -754,6 +624,42 @@ =1 {1 reused password} other {{NUM_REUSED} reused passwords}} + + Autofill prediction improvements + + + Thorium can adapt to a form's format — for example, automatically filling your birthday as MM/DD/YYYY or DD/MM/YY. Learn more about <a target="_blank" href="$1">Thorium Autofill</a></a> + + + Thorium asks if you want to use saved info to fill forms + + + TODO: Describe how autofill adapts to user preferences + + + Your info is saved on your device and isn't shared with others + + + TODO: Describe how data is used + + + Saved information + + + Delete annotation entry + + + The following entry will be deleted: $1Date of birth / $215/02/1989 + + + Delete all + + + Delete all entries + + + All the annotation entries will be deleted. This action cannot be undone + @@ -802,18 +708,6 @@ Hide password for $1example@gmail.com on $2www.google.com - - - Use your screen lock when filling passwords - - - - - - Use Windows Hello when filling passwords - - - @@ -1838,8 +1732,7 @@ Ad privacy - - + Manage your ad topics and other settings to limit what sites can learn about you to show you personalized ads @@ -2199,9 +2092,6 @@ Enhanced protection - Faster, proactive protection against dangerous websites, downloads, and extensions. Warns you about password breaches. Requires browsing data to be sent to Google. - - Real-time, proactive protection against dangerous sites, downloads, and extensions that's based on your browsing data getting sent to Google @@ -2244,13 +2134,10 @@ Standard protection - Standard protection against websites, downloads, and extensions that are known to be dangerous - - Protects against sites, downloads, and extensions that are known to be dangerous. If a page does something suspicious, URLs and bits of page content are sent to Google Safe Browsing. - + Protects against sites, downloads, and extensions that are known to be dangerous. When you visit a site, Thorium sends an obfuscated portion of the URL to Google through a privacy server that hides your IP address. If a site does something suspicious, full URLs and bits of page content are also sent. @@ -2270,9 +2157,6 @@ No protection (not recommended) - Does not protect you against dangerous websites, downloads, and extensions. You’ll still get Safe Browsing protection, where available, in other Google services, like Gmail and Search. - - Does not protect you against dangerous websites, downloads, and extensions. Your Safe Browsing settings in other Google products won't be affected. @@ -2317,7 +2201,12 @@ Advanced Protection Program"> Provides Google’s strongest account security for people at risk of targeted attacks - + + + + Secure connections + + Always use secure connections @@ -2326,8 +2215,14 @@ Use HTTPS whenever possible and get warned before loading sites that don’t support it. You can’t change this setting because you have Advanced Protection enabled. - - Warn before using insecure connections + + Ask before using insecure connections + + + For sites that don’t support secure connections, get warned before visiting the site + + + For sites that don’t support secure connections, get warned before visiting the site. You can’t change this setting because you have Advanced Protection enabled. See warnings before going to insecure sites (recommended) @@ -2338,6 +2233,19 @@ Don't see any warnings before going to insecure sites + + Warns you for insecure public & private sites + + + Private sites might include things like your company’s intranet + + + Warns you for insecure public sites + + + Doesn’t warn you for private sites, such as your company’s intranet + + Manage certificates @@ -2495,14 +2403,6 @@ Search engine - - Search engine used in the address bar. - - - - Search engine used in the address bar and the launcher. - - Learn more about default search engines @@ -2906,6 +2806,15 @@ Not allowed to enter full screen automatically + + Sites usually track your hands and fingers to augment immersive experiences + + + Allowed to track your hands + + + Not allowed to track your hands + Sites usually connect to HID devices for features that use uncommon keyboards, game controllers, and other devices @@ -2915,6 +2824,21 @@ Don't allow sites to connect to HID devices + + Smart card readers + + + Isolated Web Apps control smart card readers to gain access to smart cards that are inserted or presented to them. Smart cards usually contain identities that are used to authenticate or authorize operations, log into services, etc. + + + Isolated Web Apps automatically follow this setting. + + + Isolated Web Apps can ask to control smart card readers. Apps will gain access to smart cards presented to readers under their control. + + + Isolated Web Apps cannot control smart card readers. Apps won't gain access to any smart card. + Sites usually show images to provide illustration, like photos for online stores or news articles @@ -2957,19 +2881,19 @@ Not allowed to use JavaScript - + Sites can use the V8 optimizer - + Don’t allow sites to use the V8 optimizer - + Reduces performance but makes V8 more resistant to attacks - + Always allowed to use the V8 optimizer - + Not allowed to use V8 optimizer @@ -3243,6 +3167,21 @@ Not allowed to use virtual reality devices or data + + Sites usually ask to install web apps to enhance your experience on the site + + + Sites can ask to install web apps on your device + + + Don't allow sites to install web apps on your device + + + Allowed to ask to install web apps on your device + + + Not allowed to install web apps on your device + Sites can use advanced features from any printer accessible to your device without going through the standard Print prompt @@ -3267,6 +3206,12 @@ Do not allow sites to create a 3D map of your surroundings or track camera position + + Ask when a site wants to track your hands + + + Don't allow sites to track your hands + A site you visit can embed content from other sites, for example, images, ads, and text. Cookies set by these other sites are called third-party cookies. @@ -3339,13 +3284,13 @@ Sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads. Features on some sites may not work - + While in Incognito, sites can't use your cookies to see your browsing activity across sites, even related sites. Your browsing activity isn't used for things like personalizing ads. Features on some sites may not work. - + Allow related sites to see your activity in the group - + A company can define a group of sites that can use cookies to share your activity in the group. This is off in Incognito. @@ -3574,10 +3519,10 @@ Delete displayed data? - - These sites are in a group defined by $1google.com. Sites in a group can see your activity in the group. + + These sites are in a group defined by $1google.com. Sites in a group can see your activity in the group. - + Learn more about related sites in a new tab @@ -3595,18 +3540,18 @@ Show site details for $1google.com - + {MEMBERS, plural, - =1 {1 site in {FPS_OWNER}google.com's group} - other {{MEMBERS} sites in {FPS_OWNER}google.com's group}} + =1 {1 site in {RWS_OWNER}google.com's group} + other {{MEMBERS} sites in {RWS_OWNER}google.com's group}} - + More actions for $1google.com - + Show sites in same group - + Delete data and permissions @@ -4107,8 +4052,8 @@ History search, powered by AI - - Use everyday language to search your browsing history and find sites you visited. + + Use everyday language to search your browsing history and find sites you visited. Only sites you visit after turning on this feature are shown in AI-powered history search results. You can search your browsing history based on general page content, not only page title and URL. This gives you improved results, whether you're searching browsing history in the address bar using @history or from the History page. @@ -4116,8 +4061,8 @@ When you search browsing history, your history search terms, page content of best matches, and generated model outputs are sent to Google and may be seen by human reviewers to improve this feature. - - As you browse sites, their page contents are saved in an encrypted form on your device. + + As you browse sites, their page contents are saved in an encrypted form on your device. This may affect Thorium's performance. Learn more about history searches diff --git a/src/chrome/app/shared_settings_strings.grdp b/src/chrome/app/shared_settings_strings.grdp index b1264260..167a4f53 100644 --- a/src/chrome/app/shared_settings_strings.grdp +++ b/src/chrome/app/shared_settings_strings.grdp @@ -98,16 +98,25 @@ Preferred caption language - Manage languages + Supported Live Caption languages - Language packs are used for Live Caption and are stored on your device + Thorium can create and translate captions for the languages shown here - Translate to + Translate captions to - - Remove $1English + + Only supported Live Caption languages can be translated + + + Remove + + + Make default + + + (default) @@ -313,8 +322,8 @@ Saved tab groups - - Product specifications + + Comparison tables Wi-Fi networks diff --git a/src/components/autofill_payments_strings.grdp b/src/components/autofill_payments_strings.grdp index 85b146d5..b79e1b58 100644 --- a/src/components/autofill_payments_strings.grdp +++ b/src/components/autofill_payments_strings.grdp @@ -194,7 +194,7 @@ - Your card details are encrypted when they’re saved in your Google Account and used to pay online + Pay faster when your card is saved. Card details are encrypted in your Google Account. Save this card to use online with Google Pay for purchases across your devices @@ -328,9 +328,18 @@ Virtual card not available - - Virtual card is not available right now, please try again later - + + + + Virtual card is not available right now, please try again later. + + + + + Virtual card is not available right now, please try again later + + + Virtual card is not available right now, please contact your bank @@ -524,8 +533,11 @@ Verified - - Verifying... + + Verifying... + + + Your card is verified IBAN not filled in @@ -682,7 +694,7 @@ Manage payment methods - Save IBAN to Google Account? + Save IBAN? To autofill this IBAN next time, save it in your Google account @@ -886,9 +898,15 @@ CVC: - + Merchant doesn't accept this virtual card + + Cards not accepted by this merchant are disabled + + + Cards not accepted by this merchant are disabled such as virtual cards. + Choose how you'll verify it's you @@ -947,7 +965,7 @@ Enter correct code - + Your bank wants to verify it's you @@ -1105,6 +1123,9 @@ %1$sCard info, %2$s2 of %3$s8. + + Terms apply for card benefits + @@ -1182,6 +1203,16 @@ %1$s12/24 | %2$s123 + + + + IBAN saved to your Google Account + + + Got it + + + Card saved @@ -1189,6 +1220,12 @@ Card saved to device only + + IBAN saved + + + IBAN saved to device only + Virtual card turned on @@ -1202,6 +1239,15 @@ This card couldn't be saved in your Google Account. It's saved to Thorium on this device instead. + + This IBAN is saved in your Google Account so you can use it across Google services. + + + This IBAN couldn't be saved in your Google Account. It's saved to Thorium on this device instead. Thorium will ask you again the next time you use this IBAN. + + + This IBAN couldn't be saved in your Google Account. It's saved to Thorium on this device instead. + You can now use a virtual card to check out more securely with autofill. diff --git a/src/components/autofill_strings.grdp b/src/components/autofill_strings.grdp index e67d26b0..a710e18b 100644 --- a/src/components/autofill_strings.grdp +++ b/src/components/autofill_strings.grdp @@ -99,12 +99,12 @@ , ''' - - - - Address test data + + Developer tools + + + Test address by country - Test address from $1United states selected. @@ -291,25 +291,25 @@ Fills in payment forms with your saved payment methods - + This address will be deleted from your Google Account, $1alexpark@gmail.com - + This address will be deleted from this and your other signed-in devices - + This address will be deleted from this device - + In your Google Account, $1alexpark@gmail.com - + You will be able to use it across Google products - + You can use saved addresses across Google products. This address is saved in your Google Account, $1alexpark@gmail.com. - + You can use saved addresses across Google products. This address will be saved in your Google Account, $1alexpark@gmail.com. @@ -369,21 +369,17 @@ - - - Default + + Autofill with Google - - - Use other providers + + Autofill using another service - - - Use Google Password Manager and Thorium Autofill to save and fill passwords, passkeys, payment methods, and addresses + + Use Google Password Manager and Thorium Autofill to save and fill passwords, payment methods, and addresses - - - Use password managers and autofill services that are turned on in Android Settings + + To use another autofill service in Thorium, turn it on in Android settings and here @@ -403,9 +399,6 @@ - - Payment methods - Manage payment methods diff --git a/src/components/management_strings.grdp b/src/components/management_strings.grdp index c7ffc65d..88cb472e 100644 --- a/src/components/management_strings.grdp +++ b/src/components/management_strings.grdp @@ -172,6 +172,9 @@ Detailed system logs. <a target="_blank" href="https://support.google.com/chrome/a?p=remote-log">Learn more</a> + + Detailed system logs + Networking information such as addresses, interface configuration, and connection quality @@ -222,6 +225,12 @@ Your administrator has allowed $1Plugin VM to collect diagnostics data to improve the product experience. See <a target="_blank" href="https://www.parallels.com/pcep">https://www.parallels.com/pcep</a> for more information. + + For additional information and policies that may apply, open chrome://management in your browser. + + + Recent file access and modifications, including file names, digital fingerprints of the file content, download source, and metadata + @@ -313,7 +322,10 @@ Which URLs you visit - 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. + 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 + + + A limited list of URLs of pages you visit where legacy technology events are occuring @@ -376,6 +388,9 @@ Screen capture has started + + Extension event occurs + Files you upload or attach are sent to Google Cloud or third parties for analysis. For example, they might be scanned for sensitive data or malware and might be stored based on company policies and visible to your administrator. @@ -400,6 +415,9 @@ URLs of pages you visit are sent to Google Cloud or third parties for analysis, and may be visible to your administrator. For example, they might be scanned to detect unsafe websites or filter websites based on rules set by the administrator. + + When extensions are added to Thorium, relevant data about these extensions is sent to third parties for analysis and may be visible to your administrator. The data includes information about the extensions such as name, install time, source of install as well as activity associated with these extensions (like changing tabs, contacting websites, or accessing cookies). This data is collected for extensions installed from the Chrome Web Store as well as off-store extensions. + @@ -411,12 +429,15 @@ - Browsing data, including history and passwords can be seen and managed + Your organization can see browsing data, such as passwords and history in both work and personal profiles - For device safety, OS, browser info, and installed software may be visible + To help ensure security, it can also see the device’s OS, browser version, and what software is installed + + + $1The Company manages your profile - Things to consider + What this means diff --git a/src/components/page_info_strings.grdp b/src/components/page_info_strings.grdp index 6457d58e..afc66cce 100644 --- a/src/components/page_info_strings.grdp +++ b/src/components/page_info_strings.grdp @@ -211,8 +211,8 @@ Certificate is valid - - Certificate is not valid + + Certificate details Show certificate (issued by $1Let's Encrypt X3) @@ -388,6 +388,9 @@ Can ask to edit files and folders on your device + + Can ask to track your hands + Can ask to connect to HID devices @@ -433,6 +436,9 @@ Can ask to access cookies + + Can ask to install web apps + @@ -492,6 +498,9 @@ To use your microphone, give Thorium access in $1system settings. + + To use your location, give Thorium access in $1system settings. + system settings @@ -784,32 +793,53 @@ Review a list of on-device site data in a new window - + See related sites in a new tab - + See related sites - + This site is in a group, defined by $1gannett.com, that can see your activity - - History - - - Last visited today - - - Last visited yesterday - - - Last visited $12 days ago - - - Last visited $1Apr 4, 2021 - + + + + Last Visited + + + Today + + + Yesterday + + + $12 days ago + + + $1Apr 4, 2021 + + + + + History + + + Last visited today + + + Last visited yesterday + + + Last visited $12 days ago + + + Last visited $1Apr 4, 2021 + + + diff --git a/src/components/security_interstitials_strings.grdp b/src/components/security_interstitials_strings.grdp index affd0030..89b4b3f6 100644 --- a/src/components/security_interstitials_strings.grdp +++ b/src/components/security_interstitials_strings.grdp @@ -317,6 +317,14 @@ These charges could be one-time or recurring and may not be obvious. <a href="#" id="proceed-link">Show anyway</a> + + + This content is blocked. + + + Learn more + + Show More @@ -490,6 +498,19 @@ You are seeing this warning because this site does not support HTTPS. <a href="#" id="learn-more-link">Learn more about this warning</a> + + + $1example.com doesn’t support a secure connection + + + <ul> + <li><strong>Attackers can see and change</strong> information you send or receive from the site. + <li><strong>It's safest to visit this site later</strong> if you're using a public network. There is less risk from a trusted network, like your home or work Wi-Fi. + </ul> + + You might also contact the site owner and suggest they upgrade to HTTPS. <a href="#" id="learn-more-link">Learn more about this warning</a> + + You are seeing this warning because this site does not support HTTPS and you are under Google's Advanced Protection Program. <a href="#" id="learn-more-link">Learn more about this warning</a>