| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 2dab448300c57e623f755b23ad64198cf886f915..39dbf7a116485982739d91207d24a4e2b7e91bca 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -268,16 +268,16 @@ are declared in build/common.gypi.
|
| Detect by you
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_DEFAULT" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to the default setting and the default settings is allow.">
|
| - Allowed by default
|
| + Allow (default)
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_DEFAULT" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to the default setting and the default settings is block.">
|
| - Blocked by default
|
| + Block (default)
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_DEFAULT" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to the default setting and the default settings is ask.">
|
| - Ask by default
|
| + Ask (default)
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_DEFAULT" desc="The Website Settings popup contains several buttons for opening dropdown menus and changing site permissions. This is the text of such a button if the permission controlled by the button is set to the default setting and the default settings is detect important content.">
|
| - Detect important content by default
|
| + Automatic (default)
|
| </message>
|
| <message name="IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL" desc="The label used to describe a USB device that the user has granted the site permission to access.">
|
| <ph name="DEVICE_NAME">$1<ex>Android Phone</ex></ph>
|
| @@ -8951,18 +8951,29 @@ I don't think this site should be blocked!
|
| </if>
|
|
|
| <!-- Page Information Window -->
|
| - <if expr="not use_titlecase">
|
| - <message name="IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON" desc="Text of button in the page info that resets allow/deny decisions of invalid certificates.">
|
| - Stop using an invalid certificate
|
| - </message>
|
| - </if>
|
| - <if expr="use_titlecase">
|
| - <message name="IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON" desc="Text of button in the page info that resets allow/deny decisions of invalid certificates.">
|
| - Stop using an invalid certificate
|
| - </message>
|
| - </if>
|
| - <message name="IDS_PAGE_INFO_SITE_SETTINGS_LINK" desc="This is the text of the link pointing to Chrome's Site Settings page. This appears at the bottom of the Permissions pane of the Page Information Window.">
|
| - Site settings
|
| + <message name="IDS_WEBSITE_SETTINGS_SECURE_SUMMARY" desc="A short summary phrase at the top of the Page Info bubble (which shows when you click the lock icon) that indicates that the connection to the current website is secure.">
|
| + Secure connection
|
| + </message>
|
| + <message name="IDS_WEBSITE_SETTINGS_NOT_SECURE_SUMMARY" desc="A one-line summary at the top of the Page Info bubble (which shows when you click the security indicator) if the connection to the current website is secure.">
|
| + Your connection to this site is not secure
|
| + </message>
|
| + <message name="IDS_WEBSITE_SETTINGS_SECURE_DETAILS" desc="A short paragraph explaining a secure site to the user.">
|
| + Your information (for example, passwords or credit card numbers) is private when it is sent to this site.
|
| + </message>
|
| + <message name="IDS_WEBSITE_SETTINGS_NOT_SECURE_DETAILS" desc="A short paragraph explaining a non-secure site to the user.">
|
| + You should not enter any sensitive information on this website (for example, passwords or credit card numbers), because it could be stolen by attackers.
|
| + </message>
|
| + <message name="IDS_PAGEINFO_INVALID_CERTIFICATE_DESCRIPTION" desc="A short paragraph to the user that security warnings are disabled. This is the case when the user has encountered a certificate error for the current site and chosen to override it.">
|
| + You have chose to disable security warnings for this site.
|
| + </message>
|
| + <message name="IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON" desc="Text of button in the page info that resets allow/deny decisions of invalid certificates, which will start showing security warnings for the page again.">
|
| + Re-enable warnings
|
| + </message>
|
| + <message name="IDS_PAGE_INFO_COOKIES" desc="The label for the Cookies setting in the Page Information Window.">
|
| + Cookies
|
| + </message>
|
| + <message name="IDS_PAGE_INFO_SITE_SETTINGS_LINK" desc="This is the text of the link pointing to Chrome's Site Settings page. This appears at the bottom of the Permissions pane of the Page Information Window. It is uppercase.">
|
| + SITE SETTINGS
|
| </message>
|
|
|
| <message name="IDS_PAGEINFO_ADDRESS" desc="Locality as reported in the EV identity text.">
|
|
|