Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6f440e4..8188e03 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -495,14 +495,14 @@
<message name="IDS_HISTORY_RANGE_LABEL" desc="Label for the combo box that selects the time range.">
Show
</message>
- <message name="IDS_HISTORY_RANGE_ALL_TIME" desc="Option in the history range combo box. Does not set any time restraints and enables pagination.">
- all time visits
+ <message name="IDS_HISTORY_RANGE_ALL_TIME" desc="Option in the history range button group. Shows results a page at a time, without grouping them by domain.">
+ All
</message>
- <message name="IDS_HISTORY_RANGE_WEEK" desc="Option in the history range combo box. Sets the range to week.">
- weekly visits
+ <message name="IDS_HISTORY_RANGE_WEEK" desc="Option in the history range button group. Shows results grouped by week.">
+ Week
</message>
- <message name="IDS_HISTORY_RANGE_MONTH" desc="Option in the history range combo box. Sets the range to month.">
- monthly visits
+ <message name="IDS_HISTORY_RANGE_MONTH" desc="Option in the history range button group. Shows results grouped by month.">
+ Month
</message>
<message name="IDS_HISTORY_RANGE_TODAY" desc="The text on the button that sets the current time range back to today.">
Today
@@ -532,7 +532,7 @@
Lock
</message>
<message name="IDS_HISTORY_BLOCKED_VISIT_TEXT" desc="Text that describes an attempted visit.">
- Blocked visit attempt to <ph name="BEGIN_LINK"><a target="_top" href="$1" id="$2"></ph>page<ph name="END_LINK"></a><ex></a></ex></ph>.
+ Blocked attempt <ph name="BEGIN_LINK"><a target="_top" href="$1" id="$2"></ph> to visit a page on <ph name="DOMAIN">$3<ex>google.com</ex></ph><ph name="END_LINK"></a><ex></a></ex></ph>.
</message>
<message name="IDS_HISTORY_HAS_SYNCED_RESULTS" desc="The notification at the top of the history page indicating that it is showing visits synced from other devices.">
Showing history from your signed-in devices. <ph name="BEGIN_LINK"><a href="http://support.google.com/chrome/bin/answer.py?answer=95589"&hl=[GRITLANGCODE]"></ph>Learn more<ph name="END_LINK"></a><ex></a></ex></ph>
@@ -2920,6 +2920,10 @@
desc="Text for the button used to stop a dangerous download.">
Discard
</message>
+ <message name="IDS_REPORT_AND_DISCARD_DOWNLOAD"
+ desc="Text for the button used to upload a malicious file to Google for analysis and then discard it.">
+ Report & Discard
+ </message>
<!-- Download Tab Items -->
<message name="IDS_DOWNLOAD_LINK_PAUSE"
@@ -3239,21 +3243,51 @@
<message name="IDS_BLOCKED_POPUPS_LINK" desc="Link to popups section of content blocking management dialog, displayed in bubble when a page tries to display popups.">
Manage pop-up blocking...
</message>
- <message name="IDS_BLOCKED_MEDIASTREAM_ALLOW" desc="Radio button choice to allow a site to access microphone and camera, displayed in bubble when a page tries to access microphone and camera.">
+ <message name="IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ALLOW" desc="Radio button choice to allow a site to access microphone and camera, displayed in bubble when a page tries to access microphone and camera.">
Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your camera and microphone
</message>
- <message name="IDS_BLOCKED_MEDIASTREAM_ASK" desc="Radio button choice to ask the user for permission when a site tries to access microphone and camera, displayed in bubble when a page was blocked from accessing microphone and camera.">
+ <message name="IDS_BLOCKED_MEDIASTREAM_MIC_ALLOW" desc="Radio button choice to allow a site to access microphone, displayed in bubble when a page tries to access microphone.">
+ Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your microphone
+ </message>
+ <message name="IDS_BLOCKED_MEDIASTREAM_CAMERA_ALLOW" desc="Radio button choice to allow a site to access camera, displayed in bubble when a page tries to access camera.">
+ Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your camera
+ </message>
+ <message name="IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ASK" desc="Radio button choice to ask the user for permission when a site tries to access microphone and camera, displayed in bubble when a page was blocked from accessing microphone and camera.">
Ask if <ph name="HOST">$1<ex>mail.google.com</ex></ph> wants to access your camera and microphone
</message>
- <message name="IDS_ALLOWED_MEDIASTREAM_BLOCK" desc="Radio button choice to block a site to access microphone and camera, displayed in bubble when a page is accessing microphone and camera.">
+ <message name="IDS_BLOCKED_MEDIASTREAM_MIC_ASK" desc="Radio button choice to ask the user for permission when a site tries to access microphone, displayed in bubble when a page was blocked from accessing microphone.">
+ Ask if <ph name="HOST">$1<ex>mail.google.com</ex></ph> wants to access your microphone
+ </message>
+ <message name="IDS_BLOCKED_MEDIASTREAM_CAMERA_ASK" desc="Radio button choice to ask the user for permission when a site tries to access camera, displayed in bubble when a page was blocked from accessing camera.">
+ Ask if <ph name="HOST">$1<ex>mail.google.com</ex></ph> wants to access your camera
+ </message>
+ <message name="IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK" desc="Radio button choice to block a site to access microphone and camera, displayed in bubble when a page is accessing microphone and camera.">
Always block camera and microphone access
</message>
- <message name="IDS_BLOCKED_MEDIASTREAM_NO_ACTION" desc="Radio button choice to block a site to access microphone and camera, displayed in bubble when a page was blocked from accesssing microphone and camera.">
+ <message name="IDS_ALLOWED_MEDIASTREAM_MIC_BLOCK" desc="Radio button choice to block a site to access microphone, displayed in bubble when a page is accessing microphone.">
+ Always block microphone access
+ </message>
+ <message name="IDS_ALLOWED_MEDIASTREAM_CAMERA_BLOCK" desc="Radio button choice to block a site to access camera, displayed in bubble when a page is accessing camera.">
+ Always block camera access
+ </message>
+ <message name="IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION" desc="Radio button choice to block a site to access microphone and camera, displayed in bubble when a page was blocked from accesssing microphone and camera.">
Continue blocking camera and microphone access
</message>
- <message name="IDS_ALLOWED_MEDIASTREAM_NO_ACTION" desc="Radio button choice to allow a site to access microphone and camera, displayed in bubble when a page is accessing microphone and camera.">
+ <message name="IDS_BLOCKED_MEDIASTREAM_MIC_NO_ACTION" desc="Radio button choice to block a site to access microphone, displayed in bubble when a page was blocked from accesssing microphone.">
+ Continue blocking microphone access
+ </message>
+ <message name="IDS_BLOCKED_MEDIASTREAM_CAMERA_NO_ACTION" desc="Radio button choice to block a site to access camera, displayed in bubble when a page was blocked from accesssing camera.">
+ Continue blocking camera access
+ </message>
+ <message name="IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION" desc="Radio button choice to allow a site to access microphone and camera, displayed in bubble when a page is accessing microphone and camera.">
Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your camera and microphone
</message>
+ <message name="IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION" desc="Radio button choice to allow a site to access microphone, displayed in bubble when a page is accessing microphone.">
+ Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your microphone
+ </message>
+ <message name="IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION" desc="Radio button choice to allow a site to access camera, displayed in bubble when a page is accessing camera.">
+ Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to access your camera
+ </message>
<message name="IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT" desc="Explanatory animated text that appears (and then disappears) in the address line when popup is blocked">
Pop-up blocked
</message>
@@ -4998,6 +5032,9 @@
<message name="IDS_EXTENSION_PROMPT_CAN_ACCESS" desc="Second line in the content area of the extension or app permissions view dialog. Note that the exact wording is important. This should mean that the extension _can now_ access the listed privileges, because it has already been installed. This message appeared because the user must approve new permissions of the extension or app.">
It can:
</message>
+ <message name="IDS_EXTENSION_NO_SPECIAL_PERMISSIONS" desc="Shown when the app/extension requires no special permission">
+ Has no special permissions.
+ </message>
<message name="IDS_EXTENSION_PERMISSION_LINE" desc="Template for item in list of privileges that an extension or app has">
• <ph name="PERMISSION">$1<ex>Access your data on all websites</ex></ph>
@@ -5146,7 +5183,7 @@
Store data in your Google Drive account
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_MUSIC_MANAGER_PRIVATE" desc="Permission string for accessing a unique device identifier">
- Access a unique identifier for this computer for DRM
+ Access a unique identifier for this computer
</message>
<message name="IDS_EXTENSION_PROMPT_WARNING_NATIVE_MESSAGING" desc="Permission string for Native Messaging API.">
Communicate with cooperating native applications
@@ -5154,6 +5191,9 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE" desc="Permission string for allowing websites to connect to extensions.">
Communicate with cooperating websites
</message>
+ <message name="IDS_EXTENSION_PROMPT_WARNING_ACTIVITY_LOG_PRIVATE" desc="Permission string for the observing other extensions' API calls">
+ Monitor the behavior of other extensions, including visited URLs
+ </message>
<!-- Extension/App error messages -->
<message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found.">
@@ -5610,6 +5650,9 @@
<message name="IDS_EXTENSION_PACK_DIALOG_HEADING" desc="The heading of the pack extension dialog.">
Select the root directory of the extension to pack. To update an extension, also select the private key file to reuse.
</message>
+ <message name="IDS_EXTENSION_ADT_PACK_DIALOG_HEADING" desc="The heading of the pack extension dialog in the Apps Developer Tool.">
+ The packed extension and the private key will be written in the parent directory of the root directory of the extension to pack. To update an extension, select the private key file to reuse.
+ </message>
<message name="IDS_EXTENSION_PACK_DIALOG_ROOT_DIRECTORY_LABEL" desc="Label in the pack extension dialog for the control that lets the user select the extension to pack.">
Extension root directory:
</message>
@@ -5750,6 +5793,24 @@
<message name="IDS_EXTENSION_EXTERNAL_INSTALL_PROMPT_ABORT_BUTTON" desc="Button on the external install prompt to remove an extension installed by a third party.">
Remove from Chrome
</message>
+ <message name="IDS_EXTENSIONS_DISABLED" desc="(Disabled) label next to the application name when the application is disabled.">
+ (Disabled)
+ </message>
+ <message name="IDS_EXTENSIONS_SHOW_LOGS" desc="Text for the link to show logs.">
+ Show Logs
+ </message>
+ <message name="IDS_EXTENSIONS_MORE_DETAILS" desc="Text for the link to show more details about the extension / app.">
+ More Details
+ </message>
+ <message name="IDS_EXTENSIONS_VERSION" desc="The Version label in front of the version number of the extension / app.">
+ Version
+ </message>
+ <message name="IDS_EXTENSIONS_DELETE" desc="Text for the link to delete the extension / app.">
+ Delete
+ </message>
+ <message name="IDS_EXTENSIONS_PACK" desc="Text for the link to pack the extension / app.">
+ Pack
+ </message>
<!-- chrome://settings-frame/options_settings_app.html for the App Launcher Settings App -->
<if expr="pp_ifdef('enable_settings_app')">
@@ -6151,6 +6212,12 @@
</message>
</if>
<if expr="pp_ifdef('chromeos')">
+ <message name="IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_NAME">
+ Alternative shelf layout
+ </message>
+ <message name="IDS_FLAGS_ALTERNATE_SHELF_LAYOUT_DESCRIPTION">
+ Use the alternative shelf layout.
+ </message>
<message name="IDS_FLAGS_RELAUNCH_BUTTON" desc="Text on a button that restarts Chrome OS when clicked. ">
Restart Now
</message>
@@ -6222,19 +6289,6 @@
<message name="IDS_FLAGS_SAVE_PAGE_AS_MHTML_DESCRIPTION" desc="Description of the 'Save Page as MHTML' lab.">
Disables saving pages as HTML-only or HTML Complete; enables saving pages only as MHTML: a single text file containing HTML and all sub-resources.
</message>
- <message name="IDS_FLAGS_CLOUD_PRINT_CONNECTOR_NAME" desc="Title of the Cloud Print Connector lab">
- Cloud Print Connector
- </message>
- <if expr="is_android">
- <message name="IDS_FLAGS_CLOUD_PRINT_CONNECTOR_DESCRIPTION" desc="Mobile: Description of the Cloud Print Connector lab">
- Enables a background service that connects the Google Cloud Print service to any printers installed on this device. Once this lab is enabled, you can turn the Google Cloud Print Connector on by logging in with your Google account in the Under the Hood section of Settings.
- </message>
- </if>
- <if expr="not is_android">
- <message name="IDS_FLAGS_CLOUD_PRINT_CONNECTOR_DESCRIPTION" desc="Description of the Cloud Print Connector lab">
- Enables a background service that connects the Google Cloud Print service to any printers installed on this computer. Once this lab is enabled, you can turn the Google Cloud Print Connector on by logging in with your Google account in the Under the Hood section of Settings.
- </message>
- </if>
<message name="IDS_FLAGS_ENABLE_DEVICE_DISCOVERY_NAME" desc="Title of the enable 'device discovery' flag.">
Device Discovery
</message>
@@ -6271,12 +6325,6 @@
<message name="IDS_ENABLE_BACKLOADER_DESCRIPTION" desc="Description of the enable background loader flag.">
Enable background loader component for hosted applications.
</message>
- <message name="IDS_ENABLE_BEZEL_TOUCH_NAME" desc="Title of the enble bezel touch actions flag." >
- Enable bezel touch actions
- </message>
- <message name="IDS_ENABLE_BEZEL_TOUCH_DESCRIPTION" desc="Description of the enable bezel touch actions flag.">
- Enable bezel touch actions.
- </message>
<message name="IDS_ENABLE_SCREENSAVER_EXTENSION_NAME" desc="Title of the enble screensaver extensions flag." >
Enable screensaver extensions.
</message>
@@ -6662,11 +6710,11 @@
<message name="IDS_FLAGS_ENABLE_SCTP_DATA_CHANNELS_DESCRIPTION" desc="Description of about:flags option to turn on SCTP data channels support">
When enabled, DataChannels created by WebRTC will use the SCTP wire protocol.
</message>
- <message name="IDS_FLAGS_ENABLE_WEBAUDIO_NAME" desc="Name of the 'Enable WebAudio' lab.">
- Enable WebAudio
+ <message name="IDS_FLAGS_DISABLE_WEBAUDIO_NAME" desc="Name of the 'Disable WebAudio' lab.">
+ Disable WebAudio
</message>
- <message name="IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION" desc="Description for the flag to enable WebAudio.">
- Enabling this option allows web sites to access the WebAudio API.
+ <message name="IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION" desc="Description for the flag to disable WebAudio.">
+ Enabling this option prevents web sites from accessing the WebAudio API.
</message>
<message name="IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME" desc="Name of the 'Fixed position creates stacking context' lab.">
Fixed position elements create stacking contexts.
@@ -6741,12 +6789,6 @@
<message name="IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION" desc="Description for the flag to enable Opus playback in <video> elements.">
Enable experimental Opus playback in the video element.
</message>
- <message name="IDS_FLAGS_ENABLE_VP9_PLAYBACK_NAME" desc="Title for the flag to enable VP9 playback in <video> elements.">
- Enable VP9 playback in <video> elements.
- </message>
- <message name="IDS_FLAGS_ENABLE_VP9_PLAYBACK_DESCRIPTION" desc="Description for the flag to enable VP9 playback in <video> elements.">
- Enable experimental VP9 playback in the video element.
- </message>
<message name="IDS_FLAGS_ENABLE_VP8_ALPHA_PLAYBACK_NAME" desc="Title for the flag to enable VP8 Alpha playback in <video> elements.">
Enable VP8 Alpha playback in <video> elements.
</message>
@@ -7272,6 +7314,12 @@
<message name="IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION" desc="Description for the flag to enable packaged apps appearing in the dock in OSX.">
Enables packaged app shortcuts to be added to Applications and to appear in the dock.
</message>
+ <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME" desc="Title for the flag to enable a simplified Mac fullscreen interface.">
+ Enables simplified fullscreen.
+ </message>
+ <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION" desc="Description for the flag to enable a simplified Mac fullscreen interface.">
+ Enables a simplified and improved fullscreen experience on Mac.
+ </message>
</if>
<message name="IDS_FLAGS_ENABLE_TRANSLATE_SETTINGS_NAME" desc="Name of the flag to enable translate setting.">
Enable Translate settings.
@@ -7788,12 +7836,6 @@
<message name="IDS_OMNIBOX_KEYWORD_TEXT" desc="Text shown in the search button at the front of the omnibox when the user has selected a keyword">
Search <ph name="SITE_NAME">$1<ex>google.com</ex></ph>:
</message>
- <message name="IDS_OMNIBOX_SEARCH_TOKEN_TEXT" desc="Text shown on the right of the omnibox when the omnibox has its URL replaced by query terms">
- <ph name="SEARCH_PROVIDER_NAME">$1<ex>Google</ex></ph> Search
- </message>
- <message name="IDS_OMNIBOX_SEARCH_TOKEN_TEXT_PROMINENT" desc="Text shown on the left of the omnibox when the omnibox has its URL replaced by query terms. This is used when the UI needs to more prominently display that the text is a search term.">
- <ph name="SEARCH_PROVIDER_NAME">$1<ex>Google</ex></ph> Search:
- </message>
<if expr="pp_ifdef('ios')">
<message name="IDS_OMNIBOX_EMPTY_HINT" desc="The text displayed in the omnibox when it is empty.">
Search or type URL
@@ -8557,6 +8599,9 @@
<message name="IDS_GEOLOCATION_BLOCK_RADIO" desc="A radio button in the Content Settings dialog for blocking sites from accessing geolocation data.">
Do not allow any site to track my physical location
</message>
+ <message name="IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX" desc="The label of the 'Allow Google services to access your location' checkbox">
+ Allow Google services to access your location
+ </message>
<message name="IDS_GEOLOCATION_SET_BY_HOVER" desc="Hover text for URL in a list of exceptions, preceding the name of the granting hosted app.">
Set by app:
</message>
@@ -8792,9 +8837,51 @@
<message name="IDS_CLOUD_PRINT_ENUM_FAILED" desc="Status message to be sent to the Cloud Print server when enumerating printers failed.">
There was a problem listing printers. Some of your printers may not have registered successfully with <ph name="CLOUD_PRINT_NAME">$1<ex>Google Cloud Print</ex></ph>.
</message>
+ <message name="IDS_CLOUD_PRINT_GAIA_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate.">
+ Enter the letters above
+ </message>
+ <message name="IDS_CLOUD_PRINT_LOGIN_EMAIL_SAME_LINE" desc="The user Email address of the Google account. This label appears on the same line as the text field.">
+ Email:
+ </message>
+ <message name="IDS_CLOUD_PRINT_LOGIN_PASSWORD_SAME_LINE" desc="The user password of the Google account. This labe appears on the same line as the text field.">
+ Password:
+ </message>
+ <message name="IDS_CLOUD_PRINT_SIGNIN" desc="The label of the button to log to your Google account">
+ Sign in
+ </message>
+ <message name="IDS_CLOUD_PRINT_CANNOT_ACCESS_ACCOUNT" desc="The text of a hyperlink">
+ Can't access your account?
+ </message>
+ <message name="IDS_CLOUD_PRINT_CREATE_ACCOUNT" desc="The text of a hyperlink to create a Google account">
+ Create a Google Account
+ </message>
+ <message name="IDS_CLOUD_PRINT_CANNOT_BE_BLANK" desc="The input error message when the user hasn't entered a username or password">
+ Required field cannot be left blank
+ </message>
+ <message name="IDS_CLOUD_PRINT_LOGIN_COULD_NOT_CONNECT" desc="The connect error message">
+ Could not connect to the server
+ </message>
+ <message name="IDS_CLOUD_PRINT_ACCESS_CODE_HELP_LABEL" desc="A help link message for users who don't know what an application-specific password (aka access code) is">
+ What's this?
+ </message>
+ <message name="IDS_CLOUD_PRINT_INVALID_ACCESS_CODE_LABEL" desc="A message telling the user the application-specific password (aka access code) they entered is invalid.">
+ Invalid application-specific password.
+ </message>
<message name="IDS_SERVICE_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the service process has crashed.">
The <ph name="CLOUD_PRINT_NAME">$1<ex>Google Cloud Print</ex></ph> connector process has crashed. Restart?
</message>
+ <message name="IDS_CLOUD_PRINT_SETUP_OK_BUTTON_LABEL" desc="The button label on the 'OK' button displayed at the end sign in.">
+ OK
+ </message>
+ <message name="IDS_CLOUD_PRINT_LOGIN_SIGNIN_PREFIX" desc="The first part of the sentence that is displayed after the login info">
+ Sign in with your
+ </message>
+ <message name="IDS_CLOUD_PRINT_LOGIN_SIGNIN_SUFFIX" desc="The second part of the sentence. Google will be replaced by the Google logo. The translation of 'Account' will be display in bold">
+ Google Account
+ </message>
+ <message name="IDS_CLOUD_PRINT_ENTER_ACCESS_CODE_LABEL" desc="A message asking the user to enter an application-specific password (aka access code).">
+ Enter your application-specific password:
+ </message>
<!-- Print Preview -->
<message name="IDS_PRINT_PREVIEW_TITLE" desc="Fallback title for print preview page.">
@@ -9911,6 +9998,9 @@
<message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS" desc="This message gives details of the cryptographic primitives used to protect the HTTPS connection.">
The connection is encrypted using <ph name="CIPHER">$1<ex>AES_128</ex></ph>, with <ph name="MAC">$2<ex>SHA1</ex></ph> for message authentication and <ph name="KX">$3<ex>RSA</ex></ph> as the key exchange mechanism.
</message>
+ <message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD" desc="This message gives details of the cryptographic primitives used to protect the HTTPS connection. It should be translated in a similar manner as IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS">
+ The connection is encrypted and authenticated using <ph name="CIPHER">$1<ex>AES_128_GCM</ex></ph> and uses <ph name="KX">$2<ex>RSA</ex></ph> as the key exchange mechanism.
+ </message>
<message name="IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE" desc="This message is displayed when the first secure connection to a site failed and Chrome retried with an older protocol.">
The connection had to be retried using an older version of the TLS or SSL protocol. This typically means that the server is using very old software and may have other security issues.
</message>
@@ -10134,6 +10224,9 @@
<message name="IDS_OPTIONS_LANGUAGES_DONT_TRANSLATE_IN_THIS_LANGUAGE" desc="The label for a checkbox which indicates whether or not the language should be translated.">
Don't translate pages in this language
</message>
+ <message name="IDS_OPTIONS_LANGUAGES_CANNOT_TRANSLATE_IN_THIS_LANGUAGE" desc="The string displayed to user when the language cannot be translated.">
+ This language cannot be translated
+ </message>
<!-- HTTP POST Warning -->
<message name="IDS_HTTP_POST_WARNING_TITLE" desc="Title for dialog that warns users about a navigation that results in a repost">
@@ -10703,6 +10796,20 @@
Warning: You are not connected to production Wallet servers. Issued cards are probably invalid.
</message>
+ <!--- Autofill dialog: Wallet error messages -->
+ <message name="IDS_AUTOFILL_WALLET_BUYER_ACCOUNT_ERROR" desc="Text explaining that the user's Wallet account cannot be used.">
+ There's something wrong with your Google Wallet account.
+ </message>
+ <message name="IDS_AUTOFILL_WALLET_UPGRADE_CHROME_ERROR" desc="Text explaining that user must upgrade Chrome to use Wallet.">
+ You must upgrade Chrome to use Google Wallet.
+ </message>
+ <message name="IDS_AUTOFILL_WALLET_SERVICE_UNAVAILABLE_ERROR" desc="Text explaining that Wallet is currently unavailable.">
+ Google Wallet is currently unavailable.
+ </message>
+ <message name="IDS_AUTOFILL_WALLET_UNKNOWN_ERROR" desc="Text explaining that Wallet encountered an unknown error.">
+ Google Wallet has encounted an unknown error.
+ </message>
+
<!-- Autofill dialog: detail section -->
<message name="IDS_AUTOFILL_DIALOG_EDIT" desc="Text of link in autofill dialog which allows user to edit address + payment info.">
Edit
@@ -10803,6 +10910,12 @@
<message name="IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_CREDIT_CARD_EXPIRATION_DATE" desc="Message displayed to user when credit card expiration date validation fails.">
Card is expired
</message>
+ <message name="IDS_AUTOFILL_DIALOG_VALIDATION_CREDIT_CARD_NOT_SUPPORTED_BY_WALLET" desc="Message displayed to user when user entered a credit card number that is not supported by Google Wallet.">
+ Card type is not supported by Wallet
+ </message>
+ <message name="IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_ZIP_CODE" desc="Message displayed to user when ZIP code (postal code) validation fails.">
+ Not a valid ZIP code
+ </message>
<message name="IDS_AUTOFILL_DIALOG_VALIDATION_INVALID_PHONE_NUMBER" desc="Message displayed to user when phone number validation fails.">
Not a valid phone number
</message>
@@ -10954,6 +11067,9 @@
<message name="IDS_OPTIONS_INSTALL_LOCATION_3RD_PARTY" desc="The text explaining the the installation came from a 3rd party app.">
Installed by a third party.
</message>
+ <message name="IDS_OPTIONS_INSTALL_LOCATION_ENTERPRISE" desc="The text explaining the the installation of the extension came from an enterprise policy.">
+ Installed by enterprise policy.
+ </message>
<!-- Options search page strings. -->
<message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
@@ -11687,6 +11803,12 @@
<message name="IDS_PROFILES_EDIT_PROFILE_LINK" desc="Link in the avatar menu bubble to edit a profile.">
edit
</message>
+ <message name="IDS_PROFILES_PROFILE_USERS_BUTTON" desc="Button in the avatar menu bubble view for switching users.">
+ Users
+ </message>
+ <message name="IDS_PROFILES_PROFILE_GUEST_BUTTON" desc="Button in the avatar menu bubble view for guest browsing.">
+ Guest browsing
+ </message>
<message name="IDS_PROFILES_SWITCH_TO_PROFILE_ACCESSIBLE_NAME" desc="Description of the switch to profile button. This is used for accessibility.">
Switch to user: <ph name="PROFILE_NAME">$1<ex>First user</ex></ph>
</message>
@@ -12294,18 +12416,12 @@
Chrome cannot set wallpaper.
</message>
- <!-- File Browser -->
- <message name="IDS_FLAGS_FILE_MANAGER_LEGACY_NAME" desc="Name of about:flag option to launch the Files app in the legacy mode.">
- Legacy mode Files app
+ <!-- File Manager -->
+ <message name="IDS_FLAGS_FILE_MANAGER_NO_CHECKBOXES_NAME" desc="Name of the about:flag option to hide the selecting checkboxes to in the Files app.">
+ No selecting checkboxes
</message>
- <message name="IDS_FLAGS_FILE_MANAGER_LEGACY_DESCRIPTION" desc="Description of about:flag option to launch the Files app in the legacy mode.">
- Run Files app as an extension instead of a platform app.
- </message>
- <message name="IDS_FLAGS_FILE_MANAGER_LEGACY_UI_NAME" desc="Name of about:flag option to launch the Files app with the old ui.">
- Files.app's legacy UI
- </message>
- <message name="IDS_FLAGS_FILE_MANAGER_LEGACY_UI_DESCRIPTION" desc="Description of about:flag option to launch the Files app with the old ui.">
- Run Files app with the legacy user interface.
+ <message name="IDS_FLAGS_FILE_MANAGER_NO_CHECKBOXES_DESCRIPTION" desc="Description of the about:flag option to hide the selecting checkboxes to in the Files app.">
+ Hide selecting checkboxes in the Files.app.
</message>
<message name="IDS_FILE_BROWSER_ROOT_DIRECTORY_LABEL" desc="Root directory label.">
Files
@@ -13312,7 +13428,9 @@
Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Sync is disabled by your administrator.
</message>
<message name="IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED" desc="The message that appears in the options dialog indicating that user is signed in with the given email address, but sync has been stopped.">
- Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>. Sync has been stopped on this device.
+ Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>.
+ <ph name="LINE_BREAK"><br /><ex><br /></ex></ph>
+ Sync has been stopped on this device. Manage your synced data on <ph name="BEGIN_LINK"><a href="$2" target="_blank"><ex><a href="$2" target="_blank"></ex></ph>Google Dashboard<ph name="END_LINK"></a><ex></a></ex></ph>.
</message>
<message name="IDS_SYNC_ACCOUNT_SYNCING_TO_USER" desc="The message that appears in the options dialog indicating that account is syncing to a user with the given email address.">
Signed in as <ph name="USER_EMAIL_ADDRESS">$1<ex>foo@gmail.com</ex></ph>.
@@ -13326,15 +13444,9 @@
<message name="IDS_SYNC_INVALID_USER_CREDENTIALS" desc="Error message to display when the user name or password entered by the user are invalid.">
Invalid user name or password.
</message>
- <message name="IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS" desc="Explanatory message shown when the user must type letters shown in a captcha image to reauthenticate.">
- Enter the letters above
- </message>
<message name="IDS_SYNC_ERROR_SIGNING_IN" desc="An error was encountered while signing the user in.">
Error signing in.
</message>
- <message name="IDS_SYNC_PROMO_SIGNIN_HEADER" desc="The header at the top of the GAIA sign in box. Note that sync here is intended as a verb, not a noun.">
- Sign in and sync
- </message>
<message name="IDS_SYNC_UNRECOVERABLE_ERROR" desc="Message shown when sync setup failed due to an unrecoverable error and can't continue.">
Oops, Sync has stopped working.
</message>
@@ -13554,13 +13666,6 @@
<message name="IDS_SYNC_ENCRYPT_ALL_DATA" desc="Text of the radio that when selected causes sync to encrypt all data.">
Encrypt all synced data
</message>
- <message name="IDS_SYNC_ASP_PASSWORD_WARNING_TEXT" desc="Warning shown if the
- user enters a gaia password resembling an application specific
- password.">
- Enter your Google Account password first,
- <ph name="LINE_BREAK"><br /><ex><br /></ex></ph>
- not an application specific password.
- </message>
<message name="IDS_SYNC_PASSPHRASE_SECTION_TITLE" desc="Title of the section containing sync passphrase preferences.">
Encryption passphrase
</message>
@@ -13652,66 +13757,12 @@
<message name="IDS_SYNC_SETUP_TITLE" desc="The title of the Sync Setup overlay.">
Sign in with your Google Account
</message>
- <message name="IDS_SYNC_LOGIN_SIGNIN_PREFIX" desc="The first part of the sentence that is displayed after the login info">
- Sign in with your
- </message>
- <message name="IDS_SYNC_LOGIN_SIGNIN_SUFFIX" desc="The second part of the sentence. Google will be replaced by the Google logo. The translation of 'Account' will be display in bold">
- Google Account
- </message>
- <message name="IDS_SYNC_LOGIN_EMAIL_NEW_LINE" desc="The user Email address of the Google account. This label appears on a separate line from the text field.">
- Email
- </message>
- <message name="IDS_SYNC_LOGIN_EMAIL_SAME_LINE" desc="The user Email address of the Google account. This label appears on the same line as the text field.">
- Email:
- </message>
- <message name="IDS_SYNC_LOGIN_PASSWORD_NEW_LINE" desc="The user password of the Google account. This label appears on a separate line from the text field.">
- Password
- </message>
- <message name="IDS_SYNC_LOGIN_PASSWORD_SAME_LINE" desc="The user password of the Google account. This labe appears on the same line as the text field.">
- Password:
- </message>
- <message name="IDS_SYNC_SIGNIN" desc="The label of the button to log to your Google account">
- Sign in
- </message>
- <message name="IDS_SYNC_CANNOT_ACCESS_ACCOUNT" desc="The text of a hyperlink">
- Can't access your account?
- </message>
- <message name="IDS_SYNC_CREATE_ACCOUNT_PREFIX" desc="The text before the create account link">
- or <ph name="IDS_SYNC_CREATE_ACCOUNT">$1<ex>Create a Google Account</ex></ph>
- </message>
- <message name="IDS_SYNC_CREATE_ACCOUNT" desc="The text of a hyperlink to create a Google account">
- Create a Google Account
- </message>
- <message name="IDS_SYNC_CANNOT_BE_BLANK" desc="The input error message when the user hasn't entered a username or password">
- Required field cannot be left blank
- </message>
- <message name="IDS_SYNC_LOGIN_COULD_NOT_CONNECT" desc="The connect error message">
- Could not connect to the server
- </message>
<message name="IDS_SYNC_LOGIN_SETTING_UP" desc="A progress message">
Setting up...
</message>
<message name="IDS_SYNC_SUCCESS" desc="Operation successful">
Success!
</message>
- <message name="IDS_SYNC_ENTER_ACCESS_CODE_LABEL" desc="A message asking the user to enter an application-specific password (aka access code).">
- Enter your application-specific password:
- </message>
- <message name="IDS_SYNC_ACCESS_CODE_HELP_LABEL" desc="A help link message for users who don't know what an application-specific password (aka access code) is">
- What's this?
- </message>
- <message name="IDS_SYNC_INVALID_ACCESS_CODE_LABEL" desc="A message telling the user the application-specific password (aka access code) they entered is invalid.">
- Invalid application-specific password.
- </message>
- <message name="IDS_SYNC_ENTER_OTP_LABEL" desc="A message asking the user to enter a one-time-password (aka OTP).">
- Enter your verification code:
- </message>
- <message name="IDS_SYNC_OTP_HELP_LABEL" desc="A help link message for users who don't know what a one-time-password (aka OTP) is">
- What's this?
- </message>
- <message name="IDS_SYNC_INVALID_OTP_LABEL" desc="A message telling the user the one-time-password (aka OTP) they entered is invalid.">
- Invalid verification code.
- </message>
<message name="IDS_SYNC_SERVICE_UNAVAILABLE" desc="Error message to display when the user domain entered by the user has sync disabled.">
Sync service is not available for your domain.
</message>
@@ -13734,11 +13785,6 @@
</message>
</if>
- <!-- Success dialog strings -->
- <message name="IDS_SYNC_SETUP_OK_BUTTON_LABEL" desc="The button label on the 'OK' button displayed at the end of sync setup.">
- OK
- </message>
-
<!-- Sync sign in global error message-->
<message name="IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE" desc="Title in the signin error bubble view.">
Signin Error
@@ -13840,12 +13886,6 @@
<message name="IDS_SYNC_PROMO_TAB_TITLE" desc="The title of the sync promo tab.">
Sign in
</message>
- <message name="IDS_SYNC_PROMO_TITLE_SHORT" desc="The title at the top of the sync promo with a short product name.">
- Welcome to <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph>
- </message>
- <message name="IDS_SYNC_PROMO_TITLE_EXISTING_USER" desc="The title at the top of the sync promo shown to existing users.">
- Sign in to <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph>
- </message>
<message name="IDS_SYNC_PROMO_MESSAGE_TITLE_SHORT" desc="A short sync promo message displayed under the title.">
Sign in to get your bookmarks, history, and settings on all your devices.
</message>
@@ -13949,9 +13989,6 @@
The translation to <ph name="target_language">$1<ex>German</ex></ph> failed.
</message>
</if>
- <message name="IDS_TRANSLATE_INFOBAR_ALPHA_LANGUAGE" desc="Language display name for alpha languages. Basically it will be shown with (alpha) suffix. See also http://translate.google.com/about/ on what's alpha language.">
- <ph name="language">$1<ex>Javanese</ex></ph> (Alpha)
- </message>
<!-- Desktop notifications -->
<message name="IDS_NOTIFICATION_BALLOON_DISMISS_LABEL" desc="Text on the button which dismisses the balloon.">
@@ -14439,22 +14476,27 @@
This page wants to install a service handler.
</message>
- <!-- MediaStream messages -->
- <message name="IDS_MEDIASTREAM_BUBBLE_SECTION_ALLOWED" desc="Heading for a section in the geolocation bubble listing all sites which are currently tracking the user's location.">
- This site is accessing your camera and microphone.
- </message>
- <message name="IDS_MEDIASTREAM_BUBBLE_SECTION_BLOCKED" desc="Heading for a section in the geolocation bubble listing all sites which are currently blocked from accessing the user's location.">
- This site was blocked from accessing your camera and microphone.
- </message>
<message name="IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK" desc="Link on the media (camera and microphone) bubble that opens up the Content Settings management dialog for media settings.">
Manage media settings...
</message>
- <message name="IDS_MEDIASTREAM_ALLOWED_TOOLTIP" desc="Location bar icon tooltip text when a page is allowed to use media streams (camera, microphone).">
+ <message name="IDS_MICROPHONE_CAMERA_ALLOWED" desc="Status text that is used as location bar icon tooltip text and as media settings bubble status text when a page is allowed to use the camera and microphone.">
This page is accessing your camera and microphone.
</message>
- <message name="IDS_MEDIASTREAM_BLOCKED_TOOLTIP" desc="Location bar icon tooltip text when a page is blocked from using media streams (camera, microphone).">
+ <message name="IDS_MICROPHONE_CAMERA_BLOCKED" desc="Status text that is used as location bar icon tooltip text and as media settings bubble status text when a page is blocked from using the camera and microphone.">
This page has been blocked from accessing your camera and microphone.
</message>
+ <message name="IDS_MICROPHONE_ACCESSED" desc="Microphone usage status text that is used as tooltip text for the location bar icon and as status text of the media settings bubble when a page is using the microphone (but not the camera).">
+ This page is accessing your microphone.
+ </message>
+ <message name="IDS_CAMERA_ACCESSED" desc="Camera usage status text that is used as tooltip text for the location bar icon and as status text of the media settings bubble when a page is using the camera (but not the microphone).">
+ This page is accessing your camera.
+ </message>
+ <message name="IDS_MICROPHONE_BLOCKED" desc="Microphone usage status text that is used as tooltip text for the location bar icon and as status text of the media settings bubble when a page is blocked from using the microphone.">
+ This page has been blocked from accessing your microphone.
+ </message>
+ <message name="IDS_CAMERA_BLOCKED" desc="Camera usage status text that is used as tooltip text for the location bar icon and as status text of the media settings bubble when a page is blocked from using the camera.">
+ This page has been blocked from accessing your camera.
+ </message>
<message name="IDS_MEDIASTREAM_SETTING_CHANGED_INFOBAR_MESSAGE" desc="Infobar message for reloading when media (camera, michrophone) settings was changed by user.">
New camera and microphone settings will take effect after reloading the page.
</message>
@@ -14890,15 +14932,6 @@
<message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY" desc="Tool tip for the capture status tray icon when camera is being used">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your camera.
</message>
- <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_AUDIO_AND_VIDEO" desc="Contents of the balloon shown by the tray notification icon every time camera and microphone are used">
- <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> is using your camera and microphone.
- </message>
- <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_AUDIO_ONLY" desc="Contents of the balloon shown by the tray notification icon every time microphone is used">
- <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> is using your microphone.
- </message>
- <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_VIDEO_ONLY" desc="Contents of the balloon shown by the tray notification icon every time camera is used">
- <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> is using your camera.
- </message>
<!-- Quota messages -->
<if expr="is_android">
@@ -15008,8 +15041,6 @@
By creating a limited user, you can provide a managed environment for another user to explore the web.
As the manager of a limited user in Chrome on this device, you can determine the sites you wish to allow or restrict, review past visits, and manage other settings. A limited user is not a Google account — it applies only to this device.
-
-First, create a limited user in Chrome on this device. You can then configure the limited user's settings online anytime, from any device.
</message>
<message name="IDS_NEW_LIMITED_USER_LEARN_MORE_DONE_BUTTON" desc="Text for the 'OK' button on the 'Learn more' dialog for the limited user feature.">
OK, got it!
@@ -15017,10 +15048,16 @@
<message name="IDS_NEW_LIMITED_USER_SUCCESS_TITLE" desc="Title for the confirmation dialog that appears after a limited user has been created.">
<ph name="NEW_PROFILE_NAME">$1<ex>New User</ex></ph> has been created as a limited user!
</message>
- <message name="IDS_NEW_LIMITED_USER_SUCCESS_TEXT" desc="Informative text for the confirmation dialog that appears after a limited user has been created.">
+ <message name="IDS_NEW_LIMITED_USER_SUCCESS_TEXT_SLIDE_1" desc="Informative text for the confirmation dialog that appears after a limited user has been created. Slide 1.">
This limited user can currently browse all sites on the web.
+ </message>
+ <message name="IDS_NEW_LIMITED_USER_SUCCESS_TEXT_SLIDE_2" desc="Informative text for the confirmation dialog that appears after a limited user has been created. Slide 2.">
+ Your limited user can access their environment at any time from the user menu.
+ </message>
+ <message name="IDS_NEW_LIMITED_USER_SUCCESS_TEXT_SLIDE_3" desc="Informative text for the confirmation dialog that appears after a limited user has been created. Slide 3.">
+ As the manager of this limited user, you can configure settings for this user.
-To configure restrictions for this limited user, please sign into your account at <ph name="BEGIN_LINK"><a target="_blank" href="https://www.chrome.com/manage"></ph>www.chrome.com/manage<ph name="END_LINK"></a><ex></a></ex></ph>.
+For help, please visit our help center.
</message>
<message name="IDS_NEW_LIMITED_USER_SUCCESS_DONE_BUTTON" desc="Text for the button that closes the dialog without making any additional changes, on the limited user creation confirmation dialog.">
Got it
@@ -15430,31 +15467,7 @@
<message name="IDS_RESET_PROFILE_SETTINGS_TITLE" desc="Dialog title">
Reset profile settings
</message>
- <message name="IDS_RESET_PROFILE_SETTINGS_LABEL" desc="Label at the top of the client area of the dialog">
- What would you like to reset?
- </message>
- <message name="IDS_RESET_PROFILE_DEFAULT_SEARCH_ENGINE_CHECKBOX" desc="Checkbox of the Reset Profile Settings dialog">
- Search Engines
- </message>
- <message name="IDS_RESET_PROFILE_STARTUP_HOMEPAGE_CHECKBOX" desc="Checkbox of the Reset Profile Settings dialog">
- Home and startup pages
- </message>
- <message name="IDS_RESET_PROFILE_CONTENT_SETTINGS_CHECKBOX" desc="Checkbox of the Reset Profile Settings dialog">
- Content settings
- </message>
- <message name="IDS_RESET_PROFILE_COOKIES_CHECKBOX" desc="Checkbox of the Reset Profile Settings dialog">
- Cookies and site data
- </message>
- <message name="IDS_RESET_PROFILE_EXTENSIONS_CHECKBOX" desc="Checkbox of the Reset Profile Settings dialog">
- Extensions, new tab page and themes
- </message>
- <message name="IDS_RESET_PROFILE_EXTENSIONS_DISABLE" desc="Listbox item of the Reset Profile Settings dialog, indicating how to handle extensions">
- Disable
- </message>
- <message name="IDS_RESET_PROFILE_EXTENSIONS_UNINSTALL" desc="Listbox item of the Reset Profile Settings dialog, indicating how to handle extensions">
- Uninstall
- </message>
- <message name="IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON" desc="Checkbox of the Reset Profile Settings dialog">
+ <message name="IDS_RESET_PROFILE_SETTINGS_COMMIT_BUTTON" desc="Reset button of the Reset Profile Settings dialog">
Reset
</message>