| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index da40d803867ae33e0b23a0b93e739f8761cc8029..ea2a8d326e8c6d75004a2d8e1616b1102067b1b2 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -304,6 +304,9 @@ are declared in build/common.gypi.
|
| </if>
|
|
|
| <!-- Website Settings UI -->
|
| + <message name="IDS_WEBSITE_SETTINGS_TITLE" desc="Title for Website Settings dialog.">
|
| + Manage sites
|
| + </message>
|
| <message name="IDS_WEBSITE_SETTINGS_INFOBAR_TEXT" desc="The string shown in the infobar after the user has changed site permissions settings, reminding them to reload the page in order for the new settings to take effect.">
|
| New site permissions settings will take effect after reloading the page.
|
| </message>
|
| @@ -6890,12 +6893,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_FLAGS_ENABLE_WEB_APP_FRAME_DESCRIPTION" desc="Description of the flag that enables the web app style frame for hosted apps.">
|
| Enables the web app style frame for hosted apps, including bookmark apps. This is currently only available for Ash.
|
| </message>
|
| - <message name="IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_NAME" desc="Name of the flag that enables the website settings manager in chrome://settings.">
|
| - Enables the website settings manager.
|
| - </message>
|
| - <message name="IDS_FLAGS_ENABLE_WEBSITE_SETTINGS_DESCRIPTION" desc="Description of the flag that enables the website settings manager in chrome://settings.">
|
| - Enables the website settings manager on the settings page.
|
| - </message>
|
| <message name="IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME" desc="Name of the flag that enables the tab audio muting UI experiment in chrome://extensions.">
|
| Enable tab audio muting UI control.
|
| </message>
|
| @@ -8474,74 +8471,6 @@ I don't think this site should be blocked!
|
| Manage...
|
| </message>
|
|
|
| - <message name="IDS_WEBSITE_SETTINGS_TITLE" desc="Title for Website Settings dialog.">
|
| - Manage sites
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_EDIT_TITLE" desc="Title for Website Settings site edit dialog.">
|
| - Site settings
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_COOKIES_DESCRIPTION" desc="Label for granting cookies permission on the Website Settings single site view dialog.">
|
| - Stores data
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_DOWNLOAD_DESCRIPTION" desc="Label for granting multiple automatic downloads permission on the Website Settings single site view dialog.">
|
| - Automatic downloads
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_JAVASCRIPT_DESCRIPTION" desc="Label for granting scripts permission on the Website Settings single site view dialog.">
|
| - Runs scripts
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_IMAGES_DESCRIPTION" desc="Label for granting images permission on the Website Settings single site view dialog.">
|
| - Displays images
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_LOCATION_DESCRIPTION" desc="Label for granting geolocation permission on the Website Settings single site view dialog.">
|
| - Knows device location
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_MANAGE" desc="The label on the button that launches the Websites Settings dialog.">
|
| - Manage...
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_MEDIASTREAM_DESCRIPTION" desc="Label for granting mediastream permission on the Website Settings single site view dialog.">
|
| - Uses camera and microphone
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_NOTIFICATIONS_DESCRIPTION" desc="Label for granting notifications permission on the Website Settings single site view dialog.">
|
| - Shows notifications
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_PLUGINS_DESCRIPTION" desc="Label for granting plugins permission on the Website Settings single site view dialog.">
|
| - Uses plugins
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_POPUPS_DESCRIPTION" desc="Label for granting popup permission on the Website Settings single site view dialog.">
|
| - Displays popups
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_SEARCH_ORIGINS" desc="Placeholder text shown in the search box in the Website Settings dialog.">
|
| - Search sites
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_STORAGE_USED" desc="The status text for how much local storage a website origin is using.">
|
| - <ph name="USAGE">$1<ex>2.0 KB</ex></ph> stored data
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_BATTERY_USED" desc="The status text for how much power a website origin is using.">
|
| - <ph name="USAGE">$1<ex>16</ex></ph>% of battery
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_STORAGE_CLEAR_BUTTON" desc="The 'Clear' button in the Website Settings single site view dialog.">
|
| - Clear
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_BATTERY_STOP_BUTTON" desc="The 'Stop' button in the Website Settings single site view dialog.">
|
| - Stop
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_BATTERY_PERCENT" desc="The percent from 1 to 100 of battery consumption from a given origin or app on the Website Settings dialog.">
|
| - <ph name="VALUE">$1<ex>100</ex></ph>%
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_BATTERY_ZERO_PERCENT" desc="The percent shown when less than 1% of battery was consumed from a given origin or app on the Website Settings dialog.">
|
| - <1%
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_ALLOWED_LIST_TITLE" desc="Label above the list of allowed origins for a given permission on the Website Settings dialog.">
|
| - Allowed
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_BLOCKED_LIST_TITLE" desc="Label above the list of blocked origins for a given permission on the Website Settings dialog.">
|
| - Blocked
|
| - </message>
|
| - <message name="IDS_WEBSITE_SETTINGS_CONTENT_SETTING_ENABLED" desc="Label next to the checkbox that enables/disables a content setting.">
|
| - On
|
| - </message>
|
| -
|
| -
|
| <!-- Automatic updates -->
|
| <if expr="is_macosx">
|
| <message name="IDS_PROMOTE_INFOBAR_TEXT" desc="The text to show in the automatic update setup info bar. Mac-only.">
|
|
|