| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 2c6fce7aab6881258a08bc5716543e4087ac947e..db15d0b21b8f9a12cbd0ee4c4576178c9421e06b 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -5872,11 +5872,19 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_FLAGS_IMPORTANT_SITES_IN_CBD_DESCRIPTION" desc="Description for the flag for using important sites whitelisting in the clear browsing dialog.">
|
| Include the option to whitelist important sites in the clear browsing data dialog.
|
| </message>
|
| - <message name="IDS_FLAGS_ENABLE_AUTOPLAY_MUTED_VIDEOS_NAME" desc="Title for the flag to enable autoplay of muted videos.">
|
| - Autoplay muted videos
|
| + </if>
|
| + <message name="IDS_FLAGS_ENABLE_AUTOPLAY_MUTED_VIDEOS_NAME" desc="Title for the flag to enable autoplay of muted videos.">
|
| + Autoplay muted videos
|
| + </message>
|
| + <message name="IDS_FLAGS_ENABLE_AUTOPLAY_MUTED_VIDEOS_DESCRIPTION" desc="Description for the flag to enable autoplay of muted videos.">
|
| + Allow muted videos to autoplay.
|
| + </message>
|
| + <if expr="not is_android">
|
| + <message name="IDS_FLAGS_MEDIA_PLAYBACK_IN_CROSS_ORIGIN_IFRAMES_REQUIRES_USER_GESTURE_NAME" desc="Title for the flag of requiring user gesture for media playback in cross-origin iframes.">
|
| + User gesture requirement for media playback cross-origin iframes
|
| </message>
|
| - <message name="IDS_FLAGS_ENABLE_AUTOPLAY_MUTED_VIDEOS_DESCRIPTION" desc="Description for the flag to enable autoplay of muted videos.">
|
| - Allow muted videos to autoplay.
|
| + <message name="IDS_FLAGS_MEDIA_PLAYBACK_IN_CROSS_ORIGIN_IFRAMES_REQUIRES_USER_GESTURE_DESCRIPTION" desc="Description for the flag of requiring user gesture for media playback in cross-origin iframes.">
|
| + User gesture requirement for media playback cross-origin iframes.
|
| </message>
|
| </if>
|
| <if expr="use_ash">
|
| @@ -9922,13 +9930,13 @@ I don't think this site should be blocked!
|
| <message name="IDS_OPTIONS_EXTENSION_PROXIES_LABEL" desc="The info label for the 'Proxy settings' button when managed by an extension.">
|
| Your network proxy settings are being managed by an extension.
|
| </message>
|
| -
|
| +
|
| <if expr="chromeos">
|
| <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CUPS_PRINT" desc="The title for the section of CUPS Print in Chrome OS advanced settings.">
|
| Printers
|
| </message>
|
| <message name="IDS_OPTIONS_ADVANCED_SECTION_CUPS_PRINT_LABEL" desc="Label for the CUPS Print section in Chrome OS advanced settings.">
|
| - Set up or manage local printers.
|
| + Set up or manage local printers.
|
| </message>
|
| <message name="IDS_OPTIONS_ADVANCED_SECTION_CUPS_PRINT_MANAGE_BUTTON" desc="Text on the button to take the user to Chrome settings page of CUPS printers.">
|
| Manage
|
| @@ -14901,7 +14909,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
|
| </message>
|
| <message name="IDS_PRINTER_DETECTED_NOTIFICATION_SET_UP_GET_HELP_BUTTON" desc="Content for the notification button to direct the user to the chrome://setting CUPS printers subpage if the setup process is failed.">
|
| Get help
|
| - </message>
|
| + </message>
|
| </if>
|
|
|
| <!-- Strings for ARC intent picker -->
|
| @@ -15015,7 +15023,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
|
| Enables badging of offline pages on the New Tab page. Only relevant if offline pages are enabled.
|
| </message>
|
| <message name="IDS_FLAGS_OFFLINE_PAGES_ASYNC_DOWNLOAD_NAME" desc="Name for the flag to enable offline pages for async download.">
|
| - Enables showing "DOWNLOAD PAGE LATER" button in error pages.
|
| + Enables showing "DOWNLOAD PAGE LATER" button in error pages.
|
| </message>
|
| <message name="IDS_FLAGS_OFFLINE_PAGES_ASYNC_DOWNLOAD_DESCRIPTION" desc="Description for the flag to enable offline pages.">
|
| Enables showing "DOWNLOAD PAGE LATER" button in error pages such that the user can click on it to download the page later.
|
|
|