mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-10 03:47:44 -03:00
M113 stage 7
This commit is contained in:
Alexander Frick
parent
1ce5e3c975
commit
fad2e2f79e
7 changed files with 106 additions and 156 deletions
|
|
@ -290,6 +290,9 @@ CHAR_LIMIT guidelines:
|
|||
<message name="IDS_SIGN_IN_TO_CHROME_DISABLED_SUMMARY" desc="A descriptive line of text that appears under the 'Sign in to Thorium' option, in Thorium Settings on Android. The text explains why 'Sign in to Thorium' is disabled. 'Administrator' refers to the IT administrator of the company/organization that owns the user’s device.">
|
||||
Disabled by the administrator of this device
|
||||
</message>
|
||||
<message name="IDS_SIGN_IN_TO_CHROME_DISABLED_BY_USER_SUMMARY" desc="A descriptive line of text that appears when a user tries to signin when signin is disabled by the Google Services option in settings. The text explains why 'Sign in to Thorium' is not available.">
|
||||
Not available on your device
|
||||
</message>
|
||||
<message name="IDS_SIGN_IN_GOOGLE_ACTIVITY_CONTROLS_TITLE" desc="Title of Google activity controls preference in signed in accounts settings screen">
|
||||
Google activity controls
|
||||
</message>
|
||||
|
|
@ -2623,12 +2626,15 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_NOTIFICATION_WEBAPK_INSTALL_FAILED" desc="Indicates that the WebAPK install was unsuccessful.">
|
||||
Couldn’t install <ph name="WEBAPK_NAME">%1$s<ex>Progressive Web Apps</ex></ph>.
|
||||
</message>
|
||||
<message name="IDS_NOTIFICATION_WEBAPK_INSTALL_FAILED_CONTENTS_GENERAL" desc="Indicates that the WebAPK install was unsuccessful.">
|
||||
<message name="IDS_NOTIFICATION_WEBAPK_INSTALL_FAILED_CONTENTS_GENERAL" desc="Message content indicates that the WebAPK install was unsuccessful for a general reason.">
|
||||
Something went wrong.
|
||||
</message>
|
||||
<message name="IDS_WEBAPK_INSTALL_FAILED_ACTION_OPEN" desc="Indicates that the WebAPK install was unsuccessful.">
|
||||
<message name="IDS_WEBAPK_INSTALL_FAILED_ACTION_OPEN" desc="The label of the button which upon click would open the site user was trying to install as PWA. ">
|
||||
Go back to site
|
||||
</message>
|
||||
<message name="IDS_WEBAPK_INSTALL_FAILED_ACTION_RETRY" desc="The label of the button which upon click would retry installing the PWA" translateable="false">
|
||||
Try again
|
||||
</message>
|
||||
<message name="IDS_IPH_PWA_INSTALL_AVAILABLE_TEXT" desc="The in-product-help message for PWAs that can be installed to the device.">
|
||||
Install this app
|
||||
</message>
|
||||
|
|
@ -2961,21 +2967,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_FRE_ACTIVITY_LABEL" desc="Label for first run dialog in Android Recents.">
|
||||
Thorium First Run Experience
|
||||
</message>
|
||||
<message name="IDS_FRE_TOS" desc="Message explaining that use of Thorium is governed by terms of service.">
|
||||
By using Thorium, you agree to the <ph name="BEGIN_TOS_LINK"><TOS_LINK></ph>Google Terms of Service<ph name="END_TOS_LINK"></TOS_LINK></ph>, and the <ph name="BEGIN_ATOS_LINK"><ATOS_LINK></ph>Google Thorium and ThoriumOS Additional Terms of Service<ph name="END_ATOS_LINK"></ATOS_LINK></ph>.
|
||||
</message>
|
||||
<message name="IDS_FRE_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Thorium is governed by Thorium's terms of service, and the Google Privacy Policy.">
|
||||
By using Thorium, you agree to the <ph name="BEGIN_TOS_LINK"><TOS_LINK></ph>Google Terms of Service<ph name="END_TOS_LINK"></TOS_LINK></ph>, and the <ph name="BEGIN_ATOS_LINK"><ATOS_LINK></ph>Google Thorium and ThoriumOS Additional Terms of Service<ph name="END_ATOS_LINK"></ATOS_LINK></ph>. The <ph name="BEGIN_PRIVACY_LINK"><PRIVACY_LINK></ph>Privacy Policy<ph name="END_PRIVACY_LINK"></PRIVACY_LINK></ph> also applies.
|
||||
</message>
|
||||
<message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS" desc="Message explaining that use of Thorium is governed by Thorium's terms of service.">
|
||||
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Thorium. By continuing, you agree to the <ph name="BEGIN_LINK1"><LINK1></ph>Google Terms of Service<ph name="END_LINK1"></LINK1></ph>, and the <ph name="BEGIN_LINK2"><LINK2></ph>Google Thorium and ThoriumOS Additional Terms of Service<ph name="END_LINK2"></LINK2></ph>.
|
||||
</message>
|
||||
<message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Thorium is governed by Thorium's terms of service, and the Google Privacy Policy.">
|
||||
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Thorium. By continuing, you agree to the <ph name="BEGIN_LINK1"><LINK1></ph>Google Terms of Service<ph name="END_LINK1"></LINK1></ph>, and the <ph name="BEGIN_LINK2"><LINK2></ph>Google Thorium and ThoriumOS Additional Terms of Service<ph name="END_LINK2"></LINK2></ph>. The <ph name="BEGIN_LINK3"><LINK3></ph>Privacy Policy<ph name="END_LINK3"></LINK3></ph> also applies.
|
||||
</message>
|
||||
<message name="IDS_FRE_SEND_REPORT_CHECK" desc="Text for asking the user to allow sending stats and crash reports">
|
||||
Help make Thorium better by sending usage statistics and crash reports to Google.
|
||||
</message>
|
||||
<message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept and continue button [CHAR_LIMIT=20]">
|
||||
Accept & continue
|
||||
</message>
|
||||
|
|
@ -2999,9 +2996,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_SIGNIN_FRE_FOOTER_TOS" desc="The text is displayed in a footer on the very first screen of Thorium. The link ‘Terms of Service’ opens the Google Terms of Service.">
|
||||
By continuing, you agree to the <ph name="BEGIN_TOS_LINK"><TOS_LINK></ph>Terms of Service<ph name="END_TOS_LINK"></TOS_LINK></ph>.
|
||||
</message>
|
||||
<message name="IDS_SIGNIN_FRE_FOOTER_TOS_WITH_SUPERVISED_USER" desc="The text is displayed in a footer on the very first screen of Thorium. The link 'Terms of Service' opens the Google Terms of Service. The link 'Privacy Policy' opens the Google Privacy Policy.">
|
||||
By continuing, you agree to the <ph name="BEGIN_TOS_LINK"><TOS_LINK></ph>Terms of Service<ph name="END_TOS_LINK"></TOS_LINK></ph> and <ph name="BEGIN_PRIVACY_LINK"><PRIVACY_LINK></ph>Privacy\u00A0Policy<ph name="END_PRIVACY_LINK"></PRIVACY_LINK></ph>.
|
||||
</message>
|
||||
<message name="IDS_SIGNIN_FRE_FOOTER_METRICS_REPORTING" desc="The text is displayed in a footer on the very first screen of Thorium. Preferably, ensure consistency with the “Usage statistics and crash reports” section of the Thorium Privacy Policy (google.com/chrome/privacy).">
|
||||
To help improve the app, Thorium sends usage and crash data to Google. <ph name="BEGIN_UMA_LINK"><UMA_LINK></ph>Manage<ph name="END_UMA_LINK"></UMA_LINK></ph>
|
||||
</message>
|
||||
|
|
@ -3024,7 +3018,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Sign in to get the most out of Thorium
|
||||
</message>
|
||||
<message name="IDS_SIGNIN_FRE_SUBTITLE_VARIATION_2" desc="Subtitle shown below a welcoming title on the very first screen after opening Thorium for the first time. Asks the user to sign in to Thorium with their Google Account to use additional features that are only available to signed-in users. Try to limit translations to 50 characters. Do not exceed 75 characters.">
|
||||
Sign in for additional features and Thorium\u2019s strongest security
|
||||
Sign in for additional features
|
||||
</message>
|
||||
<message name="IDS_SIGNIN_FRE_SUBTITLE_VARIATION_3" desc="Subtitle shown below a welcoming title on the very first screen after opening Thorium for the first time. Asks the user to sign in to Thorium with their Google Account to get more useful features when they're signed in across multiple devices (like phones and computers). Try to limit translations to 50 characters. Do not exceed 75 characters.">
|
||||
Sign in to browse easier across devices
|
||||
|
|
@ -3129,6 +3123,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_SIGNIN_ACCOUNT_PICKER_GENERAL_ERROR_BUTTON" desc="Button text of the account picker bottom sheet when something went wrong in the sign-in process. User can try again if they click it.">
|
||||
Try again
|
||||
</message>
|
||||
<message name="IDS_SIGNIN_ACCOUNT_PICKER_BOTTOM_SHEET_TITLE_FOR_BACK_OF_CARD_MENU_SIGNIN" desc="The title for the bottom sheet that shows the list of accounts on the device and asks the user to select one of these accounts, when signin from BoC triggered the UI. [CHAR_LIMIT=27]">
|
||||
Sign in to Thorium
|
||||
</message>
|
||||
<message name="IDS_SIGNIN_ACCOUNT_PICKER_BOTTOM_SHEET_SUBTITLE_FOR_BACK_OF_CARD_MENU_SIGNIN" desc="The subtitle for the account picker bottom sheet that tells the user what happens if the Continue button is clicked, when signin from BoC triggered the UI.">
|
||||
Sign in to manage your preferences
|
||||
</message>
|
||||
|
||||
<!-- Personalized Signin Promos Strings -->
|
||||
<message name="IDS_SYNC_PROMO_CONTINUE_AS" desc="Button to sign into Thorium with the displayed account and without having to reenter a password. ‘John’ is replaced with the user’s given name, or the user’s full name if the given name is not available. Ensure consistency with related OneGoogle sign-in buttons (see e.g. TC ID 5569230012177947065).">
|
||||
|
|
@ -3517,6 +3517,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_CUSTOM_TAB_AMP_PUBLISHER_URL" desc="Text shown in a Custom Tab toolbar for a web page that is hosted by the Google content delivery network but was originally published by someone else.">
|
||||
From <ph name="PUBLISHER_ORIGIN"><pub>%1$s</pub><ex>example.com</ex></ph> – <ph name="BEGIN_DEEMPHASIZED"><bg></ph>delivered by Google<ph name="END_DEEMPHASIZED"></bg></ph>
|
||||
</message>
|
||||
<message name="IDS_CUSTOM_TAB_SIDE_SHEET_MAXIMIZE" desc="The accesibility text for maximize button in side-sheet custom tab.">
|
||||
Expand to full screen
|
||||
</message>
|
||||
<message name="IDS_CUSTOM_TAB_SIDE_SHEET_MINIMIZE" desc="The accesibility text for minimize button in side-sheet custom tab.">
|
||||
Collapse to side view
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_PREFERENCE_NEW_TAB" desc="Title name for the new tab option in the preference.">
|
||||
New tab
|
||||
</message>
|
||||
|
|
@ -3526,6 +3532,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_PREFERENCE_VOICE_SEARCH" desc="Title name for the voice search option in the preference.">
|
||||
Voice search
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_PREFERENCE_ADD_TO_BOOKMARKS" desc="Title name for the add to bookmarks option in the preference.">
|
||||
Add to bookmarks
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_PREFERENCE_TRANSLATE" desc="Title name for the translate option in the preference.">
|
||||
Translate
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_PREFERENCE_BASED_ON_YOUR_USAGE" desc="Title name for the based on your usage option in the preference.">
|
||||
Based on your usage
|
||||
</message>
|
||||
|
|
@ -3544,6 +3556,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_VOICE_SEARCH_IPH" desc="An in-product-help message for the voice search button.">
|
||||
Quickly search with your voice. To edit this shortcut, touch and hold.
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_ADD_TO_BOOKMARKS_IPH" desc="An in-product-help message for the add to bookmarks button.">
|
||||
Quickly bookmark this page. To edit this shortcut, touch and hold.
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_TRANSLATE_IPH" desc="An in-product-help message for the voice search button.">
|
||||
Quickly translate this page. To edit this shortcut, touch and hold.
|
||||
</message>
|
||||
<message name="IDS_ADAPTIVE_TOOLBAR_BUTTON_NEW_TAB_IPH_SETTINGS" desc="An in-product-help message for the new tab button referring to toolbar settings.">
|
||||
Quickly open a new tab. To edit this shortcut, go to Settings.
|
||||
</message>
|
||||
|
|
@ -3736,19 +3754,16 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_BOOKMARK_CHOOSE_FOLDER" desc="Title for the dialog that moves bookmarks to another folder [CHAR_LIMIT=32]">
|
||||
Choose folder
|
||||
</message>
|
||||
<message name="IDS_BOOKMARK_ACTION_BAR_EDIT_FOLDER" desc="Button text for editing current folder action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
Edit folder
|
||||
</message>
|
||||
<message name="IDS_BOOKMARK_ACTION_BAR_MOVE" desc="Button text for bookmark move action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
<message name="IDS_BOOKMARK_TOOLBAR_MOVE" desc="Button text for bookmark move action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
Move bookmarks
|
||||
</message>
|
||||
<message name="IDS_BOOKMARK_ACTION_BAR_DELETE" desc="Button text for bookmark delete action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
<message name="IDS_BOOKMARK_TOOLBAR_DELETE" desc="Button text for bookmark delete action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
Delete bookmarks
|
||||
</message>
|
||||
<message name="IDS_BOOKMARK_ACTION_BAR_CLOSE" desc="Button text for closing the current bookmark dialog on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
<message name="IDS_BOOKMARK_TOOLBAR_CLOSE" desc="Button text for closing the current bookmark dialog on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
Close dialog
|
||||
</message>
|
||||
<message name="IDS_BOOKMARK_ACTION_BAR_SEARCH" desc="Button text for bookmark search action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
<message name="IDS_BOOKMARK_TOOLBAR_SEARCH" desc="Button text for bookmark search action on the bookmark action bar [CHAR_LIMIT=32]">
|
||||
Search your bookmarks
|
||||
</message>
|
||||
<message name="IDS_BOOKMARK_NO_RESULT" desc="Text explaining that no bookmarks are found to match a search query">
|
||||
|
|
@ -4064,9 +4079,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_ACCESSIBILITY_FIND_TOOLBAR_BTN_PREV" desc="Content description for the button to go to the previous find in page result.">
|
||||
Previous
|
||||
</message>
|
||||
<message name="IDS_ACCESSIBILITY_TABSTRIP_BTN_EMPTY_NEW_TAB" desc="Content description for the new tab button.">
|
||||
New tab
|
||||
</message>
|
||||
<message name="IDS_ACCESSIBILITY_TABSTRIP_BTN_INCOGNITO_TOGGLE_STANDARD" desc="Content description for the Incognito tabs toggle button when viewing standard tabs.">
|
||||
Enter Incognito mode
|
||||
</message>
|
||||
|
|
@ -4932,15 +4944,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_NEAR_OOM_INTERVENTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can resume what it was doing.">
|
||||
Resume
|
||||
</message>
|
||||
|
||||
<!-- Autofill Assistant preferences -->
|
||||
<!-- TODO(b/168178344): Move to Assistant settings strings section below. -->
|
||||
<message name="IDS_PREFS_AUTOFILL_ASSISTANT_TITLE" desc="Title for the Autofill Assistant preferences screen. [CHAR_LIMIT=32]">
|
||||
Google Assistant in Thorium
|
||||
</message>
|
||||
<message name="IDS_PREFS_AUTOFILL_ASSISTANT_SUMMARY" desc="Summary for the Autofill Assistant preferences screen.">
|
||||
Helps you complete tasks, such as checkout, throughout the web
|
||||
</message>
|
||||
<!-- Usage Stats strings -->
|
||||
<message name="IDS_USAGE_STATS_CONSENT_TITLE" desc="Title for activity authorizing Digital Wellbeing to access Thorium usage data">
|
||||
Show your Thorium activity in Digital Wellbeing?
|
||||
|
|
@ -5389,11 +5392,6 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
chrome_image_<ph name="CURRENT_TIMESTAMP_MS">%1$s<ex>1582667748515</ex></ph>
|
||||
</message>
|
||||
|
||||
<!-- Share Crow strings -->
|
||||
<message name="IDS_CROW_IPH" desc="In product help string for Crow feature">
|
||||
Show thanks to this creator
|
||||
</message>
|
||||
|
||||
<!-- Chime DFM module strings -->
|
||||
<message name="IDS_CHIME_MODULE_TITLE" desc="Text shown when the chime module is referenced in install start, success, failure UI (e.g. in IDS_MODULE_INSTALL_START_TEXT, which will expand to 'Installing Google Notifications Platform for Thorium…').">
|
||||
Google Notifications Platform
|
||||
|
|
@ -5522,56 +5520,13 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
Image descriptions will resume when you connect to Wi-Fi
|
||||
</message>
|
||||
|
||||
<!-- Assistant voice search consent ui. -->
|
||||
<message name="IDS_AVS_CONSENT_UI_TITLE" desc="Title for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Get a better voice experience on the web
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_SUBTITLE" desc="Subtitle for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Google Assistant can complete actions across websites for you
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_BODY" desc="Body for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
To help you complete tasks, Google will receive the URLs and contents of sites on which you use Assistant, as well as information you submit through Assistant. This information may be stored in your Google account. You can turn off Assistant in Thorium settings.
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_CONTENT_DESCRIPTION" desc="Enable button text for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Assistant voice search consent ui
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_HALF_HEIGHT_DESCRIPTION" desc="Enable button text for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Assistant voice search consent ui opened at half height
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_FULL_HEIGHT_DESCRIPTION" desc="Enable button text for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Assistant voice search consent ui opened at full height
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_CLOSED_DESCRIPTION" desc="Enable button text for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Assistant voice search consent ui closed
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_SIMPLIFIED_TITLE" desc="Simplified title for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Get a better voice experience
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_SIMPLIFIED_BODY" desc="Simplified body for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Knowing the URLs of sites allows Google Assistant to help you complete tasks. You can turn off Assistant in Thorium settings.
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_SIMPLIFIED_ACCEPT" desc="Button text for the accept button for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
Yes, I’m in
|
||||
</message>
|
||||
<message name="IDS_AVS_CONSENT_UI_SIMPLIFIED_DENY" desc="Button text for the deny button for a dialog asking the user's permission to use Assistant for voice search.">
|
||||
No thanks
|
||||
</message>
|
||||
|
||||
<!-- Assistant settings strings-->
|
||||
<message name="IDS_AVS_SETTING_CATEGORY_TITLE" desc="Title of the Assistant voice search setting category.">
|
||||
Voice assistance
|
||||
</message>
|
||||
<message name="IDS_AVS_SETTING_ENABLED_TITLE" desc="Title of the Assistant voice search setting.">
|
||||
Enhanced voice search
|
||||
</message>
|
||||
<message name="IDS_AVS_SETTING_ENABLED_DESCRIPTION" desc="Description of the Assistant voice search setting.">
|
||||
Google Assistant provides a better voice experience for searching the web and engaging with sites you have open. Google Assistant will receive the URL and contents of sites you use with it.
|
||||
</message>
|
||||
|
||||
<!-- WebID Account Selection strings -->
|
||||
<message name="IDS_ACCOUNT_SELECTION_SHEET_TITLE_EXPLICIT" desc="Header for sign in sheet. Sheet is shown to prompt user for sign in consent.">
|
||||
Sign in to <ph name="SITE_ETLD_PLUS_ONE">%1$s<ex>rp.example</ex></ph> with <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE">%2$s<ex>idp.com</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_ACCOUNT_SELECTION_SHEET_SUBTITLE_EXPLICIT" desc="Message shown when the user is shown the federated identity login prompt. This message is the subtitle for the sign in sheet, which contains the top-level domain of the page the user is visiting when the user is receiving a prompt from an iframe embedded on such page.">
|
||||
on <ph name="MAIN_FRAME_ETLD_PLUS_ONE">%1$s<ex>main-frame.example</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_ACCOUNT_SELECTION_DATA_SHARING_CONSENT_NO_PP_OR_TOS" desc="The consent text shown to the user before sign up when there is no privacy policy or terms of service.">
|
||||
To continue, <ph name="IDENTITY_PROVIDER_ETLD_PLUS_ONE">%1$s<ex>idp.com</ex></ph> will share your name, email address, and profile picture with this site.
|
||||
</message>
|
||||
|
|
@ -5734,6 +5689,17 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
|||
<message name="IDS_UNDO_RESTORATION_BUTTON_TEXT" desc="Appears in pop-up message button text when a Custom Tab session is restored, giving the user the option to undo the restoration.">
|
||||
Undo
|
||||
</message>
|
||||
|
||||
<!-- Quick Delete strings -->
|
||||
<message name="IDS_QUICK_DELETE_DIALOG_TITLE" desc="Title of the dialog when asking users to confirm deleting the last 15 minutes of browsing data.">
|
||||
Delete last 15 minutes?
|
||||
</message>
|
||||
<message name="IDS_QUICK_DELETE_DIALOG_DESCRIPTION" desc="Description of the dialog when asking users to confirm deleting the last 15 minutes of browsing data.">
|
||||
Following data from the last 15 minutes will be deleted
|
||||
</message>
|
||||
<message name="IDS_QUICK_DELETE_SNACKBAR_MESSAGE" desc="Text inside the snackbar which is shown once the user confirms deletion via the 'Delete last 15 minutes' option present inside the three dots menu.">
|
||||
Deleted history, cookies, and other data
|
||||
</message>
|
||||
</messages>
|
||||
</release>
|
||||
</grit>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
#include "base/observer_list.h"
|
||||
#include "base/ranges/algorithm.h"
|
||||
#include "base/strings/string_util.h"
|
||||
#include "base/timer/elapsed_timer.h"
|
||||
#include "base/trace_event/trace_event.h"
|
||||
#include "base/values.h"
|
||||
#include "base/version.h"
|
||||
|
|
@ -505,26 +504,28 @@ void VariationsService::RegisterPrefs(PrefRegistrySimple* registry) {
|
|||
SafeSeedManager::RegisterPrefs(registry);
|
||||
VariationsSeedStore::RegisterPrefs(registry);
|
||||
|
||||
// This preference will only be written by the policy service, which will fill
|
||||
// it according to a value stored in the User Policy.
|
||||
registry->RegisterStringPref(prefs::kVariationsRestrictParameter,
|
||||
std::string());
|
||||
registry->RegisterIntegerPref(
|
||||
prefs::kDeviceVariationsRestrictionsByPolicy,
|
||||
static_cast<int>(RestrictionPolicy::NO_RESTRICTIONS));
|
||||
registry->RegisterDictionaryPref(
|
||||
prefs::kVariationsGoogleGroups,
|
||||
static_cast<int>(RestrictionPolicy::NO_RESTRICTIONS));
|
||||
// This preference keeps track of the country code used to filter
|
||||
// permanent-consistency studies.
|
||||
registry->RegisterListPref(prefs::kVariationsPermanentConsistencyCountry);
|
||||
// This preference is used to override the variations country code which is
|
||||
// consistent across different chrome version.
|
||||
registry->RegisterStringPref(prefs::kVariationsPermanentOverriddenCountry,
|
||||
std::string());
|
||||
// This preference keeps track of the country code used to filter
|
||||
// permanent-consistency studies.
|
||||
registry->RegisterListPref(prefs::kVariationsPermanentConsistencyCountry);
|
||||
// This preference keeps track of ChromeVariations enum policy which
|
||||
// allows the admin to restrict the set of variations applied.
|
||||
registry->RegisterIntegerPref(
|
||||
prefs::kVariationsRestrictionsByPolicy,
|
||||
static_cast<int>(RestrictionPolicy::NO_RESTRICTIONS));
|
||||
|
||||
registry->RegisterIntegerPref(
|
||||
prefs::kDeviceVariationsRestrictionsByPolicy,
|
||||
static_cast<int>(RestrictionPolicy::NO_RESTRICTIONS));
|
||||
// This preference will only be written by the policy service, which will fill
|
||||
// it according to a value stored in the User Policy.
|
||||
registry->RegisterStringPref(prefs::kVariationsRestrictParameter,
|
||||
std::string());
|
||||
}
|
||||
|
||||
// static
|
||||
|
|
@ -643,7 +644,6 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
|
|||
UMA_HISTOGRAM_CUSTOM_COUNTS("Variations.TimeSinceLastFetchAttempt",
|
||||
time_since_last_fetch.InMinutes(), 1,
|
||||
base::Days(7).InMinutes(), 50);
|
||||
UMA_HISTOGRAM_COUNTS_100("Variations.RequestCount", request_count_);
|
||||
++request_count_;
|
||||
last_request_started_time_ = now;
|
||||
delta_error_since_last_success_ = false;
|
||||
|
|
@ -885,23 +885,12 @@ void VariationsService::PerformSimulationWithVersion(
|
|||
if (!version.IsValid())
|
||||
return;
|
||||
|
||||
const base::ElapsedTimer timer;
|
||||
|
||||
auto entropy_providers = state_manager_->CreateEntropyProviders();
|
||||
|
||||
std::unique_ptr<ClientFilterableState> client_state =
|
||||
field_trial_creator_.GetClientFilterableStateForVersion(version);
|
||||
auto result = SimulateSeedStudies(seed, *client_state, *entropy_providers);
|
||||
|
||||
UMA_HISTOGRAM_COUNTS_100("Variations.SimulateSeed.NormalChanges",
|
||||
result.normal_group_change_count);
|
||||
UMA_HISTOGRAM_COUNTS_100("Variations.SimulateSeed.KillBestEffortChanges",
|
||||
result.kill_best_effort_group_change_count);
|
||||
UMA_HISTOGRAM_COUNTS_100("Variations.SimulateSeed.KillCriticalChanges",
|
||||
result.kill_critical_group_change_count);
|
||||
|
||||
UMA_HISTOGRAM_TIMES("Variations.SimulateSeed.Duration", timer.Elapsed());
|
||||
|
||||
NotifyObservers(result);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -114,6 +114,14 @@ about:version template page
|
|||
</tr>
|
||||
</if>
|
||||
<if expr="is_android">
|
||||
<tr>
|
||||
<td class="label">targetSdkVersion</td>
|
||||
<td class="version">$i18n{target_sdk_version}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">isAtLeastU/targetsAtLeastU</td>
|
||||
<td class="version">$i18n{targets_u}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">$i18n{gms_name}</td>
|
||||
<td class="version" id="gms_version">
|
||||
|
|
|
|||
|
|
@ -345,8 +345,6 @@ bool IsDefaultSupportedAudioType(const AudioType& type) {
|
|||
case AudioCodec::kPCM_S24BE:
|
||||
case AudioCodec::kPCM_ALAW:
|
||||
case AudioCodec::kVorbis:
|
||||
case AudioCodec::kAC3:
|
||||
case AudioCodec::kEAC3:
|
||||
return true;
|
||||
case AudioCodec::kAMR_NB:
|
||||
case AudioCodec::kAMR_WB:
|
||||
|
|
@ -362,6 +360,13 @@ bool IsDefaultSupportedAudioType(const AudioType& type) {
|
|||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
case AudioCodec::kAC3:
|
||||
case AudioCodec::kEAC3:
|
||||
#if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,9 +66,8 @@ declare_args() {
|
|||
# Override to dynamically link the cras (ChromeOS audio) library.
|
||||
use_cras = is_chromeos_device
|
||||
|
||||
# Enables AC3/EAC3 audio demuxing. This is enabled only on Chromecast, since
|
||||
# it only provides demuxing, and is only useful for AC3/EAC3 audio
|
||||
# pass-through to HDMI sink on Chromecast.
|
||||
# Enables AC3/EAC3 audio handling in chromium. This includes demuxing,
|
||||
# on-device decoding and bitstream passthrough as supported by device.
|
||||
enable_platform_ac3_eac3_audio = true
|
||||
|
||||
enable_platform_mpeg_h_audio = true
|
||||
|
|
@ -259,7 +258,8 @@ if (is_cast_media_device) {
|
|||
"video_decoder",
|
||||
]
|
||||
_default_mojo_media_host = "gpu"
|
||||
} else if (is_mac || (is_win && enable_platform_dts_audio)) {
|
||||
} else if (is_mac || (is_win && (enable_platform_dts_audio ||
|
||||
enable_platform_ac3_eac3_audio))) {
|
||||
_default_mojo_media_services = [
|
||||
"audio_decoder",
|
||||
"audio_encoder",
|
||||
|
|
@ -362,3 +362,7 @@ if (media_use_ffmpeg) {
|
|||
if (enable_library_cdms || is_win) {
|
||||
media_subcomponent_deps += [ "//media/cdm:cdm_type_conversion" ]
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
media_subcomponent_deps += [ "//media/base/win:media_foundation_util" ]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ src:*third_party/vulkan-deps/vulkan-loader/src/loader*
|
|||
src:*third_party/vulkan-deps/vulkan-validation-layers/src/layers/*
|
||||
src:*third_party/angle/src/common/vulkan/vulkan_icd.cpp
|
||||
|
||||
src:*components/os_crypt/*
|
||||
src:*components/os_crypt/sync/*
|
||||
|
||||
src:*content/browser/accessibility/browser_accessibility_auralinux.cc
|
||||
src:*ui/accessibility/platform/ax_platform_node_auralinux.cc
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include "ui/gtk/native_theme_gtk.h"
|
||||
|
||||
#include "base/no_destructor.h"
|
||||
#include "base/ranges/algorithm.h"
|
||||
#include "base/strings/strcat.h"
|
||||
#include "base/command_line.h"
|
||||
#include "cc/paint/paint_canvas.h"
|
||||
|
|
@ -47,6 +48,11 @@ SkBitmap GetWidgetBitmap(const gfx::Size& size,
|
|||
CairoSurface surface(bitmap);
|
||||
cairo_t* cr = surface.cairo();
|
||||
|
||||
double opacity = 1;
|
||||
GtkStyleContextGet(context, "opacity", &opacity, nullptr);
|
||||
if (opacity < 1)
|
||||
cairo_push_group(cr);
|
||||
|
||||
switch (bg_mode) {
|
||||
case BG_RENDER_NORMAL:
|
||||
gtk_render_background(context, cr, 0, 0, size.width(), size.height());
|
||||
|
|
@ -60,6 +66,13 @@ SkBitmap GetWidgetBitmap(const gfx::Size& size,
|
|||
if (render_frame) {
|
||||
gtk_render_frame(context, cr, 0, 0, size.width(), size.height());
|
||||
}
|
||||
|
||||
if (opacity < 1) {
|
||||
cairo_pop_group_to_source(cr);
|
||||
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
|
||||
cairo_paint_with_alpha(cr, opacity);
|
||||
}
|
||||
|
||||
bitmap.setImmutable();
|
||||
return bitmap;
|
||||
}
|
||||
|
|
@ -85,40 +98,6 @@ NativeThemeGtk* NativeThemeGtk::instance() {
|
|||
NativeThemeGtk::NativeThemeGtk()
|
||||
: NativeThemeBase(/*should_only_use_dark_colors=*/false,
|
||||
ui::SystemTheme::kGtk) {
|
||||
// g_type_from_name() is only used in GTK3.
|
||||
if (!GtkCheckVersion(4)) {
|
||||
// These types are needed by g_type_from_name(), but may not be registered
|
||||
// at this point. We need the g_type_class magic to make sure the compiler
|
||||
// doesn't optimize away this code.
|
||||
g_type_class_unref(g_type_class_ref(gtk_button_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_entry_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_frame_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_header_bar_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_image_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_info_bar_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_label_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_menu_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_menu_bar_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_menu_item_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_range_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_scrollbar_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_scrolled_window_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_separator_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_spinner_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_text_view_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_toggle_button_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_tree_view_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_window_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_combo_box_text_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_cell_view_get_type()));
|
||||
g_type_class_unref(g_type_class_ref(gtk_scale_get_type()));
|
||||
|
||||
// Initialize the GtkTreeMenu type. _gtk_tree_menu_get_type() is private,
|
||||
// so we need to initialize it indirectly.
|
||||
auto model = TakeGObject(GTK_TREE_MODEL(GtkTreeStoreNew(G_TYPE_STRING)));
|
||||
auto combo = TakeGObject(gtk_combo_box_new_with_model(model));
|
||||
}
|
||||
|
||||
ui::ColorProviderManager::Get().AppendColorProviderInitializer(
|
||||
base::BindRepeating(AddGtkNativeColorMixer));
|
||||
|
||||
|
|
@ -193,8 +172,7 @@ void NativeThemeGtk::OnThemeChanged(GtkSettings* settings,
|
|||
// HighContrast (GNOME) and ContrastHighInverse (MATE). So infer the contrast
|
||||
// based on if the theme name contains both "high" and "contrast",
|
||||
// case-insensitive.
|
||||
std::transform(theme_name.begin(), theme_name.end(), theme_name.begin(),
|
||||
::tolower);
|
||||
base::ranges::transform(theme_name, theme_name.begin(), ::tolower);
|
||||
bool high_contrast = theme_name.find("high") != std::string::npos &&
|
||||
theme_name.find("contrast") != std::string::npos;
|
||||
SetPreferredContrast(
|
||||
|
|
@ -268,8 +246,8 @@ void NativeThemeGtk::PaintMenuSeparator(
|
|||
return (rect.height() - separator_thickness) / 2;
|
||||
}
|
||||
};
|
||||
auto context = GetStyleContextFromCss(
|
||||
StrCat({GtkCssMenu(), " GtkSeparator#separator.horizontal"}));
|
||||
auto context =
|
||||
GetStyleContextFromCss(StrCat({GtkCssMenu(), " separator.horizontal"}));
|
||||
int min_height = 1;
|
||||
auto margin = GtkStyleContextGetMargin(context);
|
||||
auto border = GtkStyleContextGetBorder(context);
|
||||
|
|
@ -295,8 +273,8 @@ void NativeThemeGtk::PaintFrameTopArea(
|
|||
const FrameTopAreaExtraParams& frame_top_area,
|
||||
ColorScheme color_scheme) const {
|
||||
auto context = GetStyleContextFromCss(frame_top_area.use_custom_frame
|
||||
? "#headerbar.header-bar.titlebar"
|
||||
: "GtkMenuBar#menubar");
|
||||
? "headerbar.header-bar.titlebar"
|
||||
: "menubar");
|
||||
ApplyCssToContext(context, "* { border-radius: 0px; border-style: none; }");
|
||||
gtk_style_context_set_state(context, frame_top_area.is_active
|
||||
? GTK_STATE_FLAG_NORMAL
|
||||
|
|
|
|||
Loading…
Reference in a new issue