Index: chrome/app/chromium_strings.grd |
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd |
index e89f3dfba90fe56c7f5c7e948a9f51fa2973a519..9cfc2f850489d4c8a4ef179c93244f6fe480dcf3 100644 |
--- a/chrome/app/chromium_strings.grd |
+++ b/chrome/app/chromium_strings.grd |
@@ -777,15 +777,33 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o |
<message name="IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_MULTIPLE_SETTINGS" desc="Text shown in the settings reset dialog explaining that some of the user's settings may have been modified by unwanted software or extensions."> |
The following Chromium settings may have been modified by unwanted software or extensions: |
</message> |
- <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine."> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine."> |
Do you want to restore Chromium's default search engine? |
</message> |
- <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page."> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine."> |
+ Do you want to restore Chromium's default search engine? This will also disable one extension. |
+ </message> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine."> |
+ Do you want to restore Chromium's default search engine? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions. |
+ </message> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page."> |
Do you want to restore Chromium's default startup page? |
</message> |
- <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage."> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page."> |
+ Do you want to restore Chromium's default startup page? This will also disable one extension. |
+ </message> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page."> |
+ Do you want to restore Chromium's default startup page? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions. |
+ </message> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage."> |
Do you want to restore Chromium's default homepage? |
</message> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage."> |
+ Do you want to restore Chromium's default homepage? This will also disable one extension. |
+ </message> |
+ <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage."> |
+ Do you want to restore Chromium's default homepage? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions. |
+ </message> |
<!-- Sync/sign-in error messages --> |
<if expr="not chromeos"> |