| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 3204eb6c254605ed2f5b88e9a442e87d9ed168ba..d6b9d6036d519057b57187c7eeb719870eeccb87 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -1320,10 +1320,10 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
|
| Change to <ph name="URL">$1<ex>google.com</ex></ph>
|
| </message>
|
|
|
| - <message name="IDS_SETTING_CHANGE_NO_BACKUP_TITLE" desc="The title of the bubble and the wrench menu item with a generic settings change.">
|
| + <message name="IDS_SETTING_CHANGE_TITLE" desc="The title of the bubble and the wrench menu item with a generic settings change.">
|
| Attempted settings change
|
| </message>
|
| - <message name="IDS_SETTING_CHANGE_NO_BACKUP_BUBBLE_MESSAGE" desc="The text of the generic settings change notification.">
|
| + <message name="IDS_SETTING_CHANGE_BUBBLE_MESSAGE" desc="The text of the generic settings change notification.">
|
| Arrr! Something tried to commandeer your settings!
|
| </message>
|
| <message name="IDS_SETTING_CHANGE_NO_BACKUP_STARTUP_RESET_BUBBLE_MESSAGE" desc="The text of the generic settings change notification, additionally informing user that the startup settings have been reset to defaults.">
|
| @@ -1336,6 +1336,12 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
|
| <message name="IDS_KEEP_SETTING" desc="The title of the button that confirms staying with the previous settings.">
|
| Keep my settings
|
| </message>
|
| + <message name="IDS_CHANGE_SETTING" desc="The title of the button that confirms changing to the new settings, usually described by a domain name or search engine name.">
|
| + Change to <ph name="NEW_SETTING_NAME">$1<ex>Awesome Site</ex></ph>
|
| + </message>
|
| + <message name="IDS_CHANGE_SETTING_NO_NAME" desc="The title of the button that confirms changing to the new settings.">
|
| + Change settings
|
| + </message>
|
|
|
| <!-- Keywords -->
|
| <message name="IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR" desc="The separator between a result in the autocomplete popup and its description.">
|
|
|