Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2093)

Unified Diff: chrome/app/google_chrome_strings.grd

Issue 132583002: Installer string cleaning following Chrome Frame removal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/app/google_chrome_strings.grd
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 92757a1f78339ecfe9ca93031b478781b8242d62..934be64f8c65cfa028c948273431fb4ecc6f4db0 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -161,9 +161,6 @@ Chrome supports. -->
</message>
</if>
<if expr="is_win">
- <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name">
- Google Chrome Frame
- </message>
<message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launcher application name">
Google Chrome App Launcher
</message>
@@ -182,30 +179,6 @@ Chrome supports. -->
<message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name">
Google Chrome Binaries
</message>
- <message name="IDS_VERSIONMISMATCH_HEADER">
- Chrome Frame Update.
- </message>
- <message name="IDS_VERSIONMISMATCH">
- Chrome Frame has been updated. Please relaunch your browser. Chrome version: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chrome Frame version: <ph name="TODO_0002">%ls<ex>TODO</ex></ph>
- </message>
- <message name="IDS_VERSIONUNKNOWN">
- Unknown version.
- </message>
- <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label">
- About Chrome Frame...
- </message>
- <message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame Ready Mode">
- http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&amp;answer=161796
- </message>
- <message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame turndown">
- http://support.google.com/chrome/?p=ib_chromeframe
- </message>
- <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Chrome Frame turndown prompt for IE 6, 7, and 8">
- This site is using the retired Chrome Frame plug-in which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser.
- </message>
- <message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Chrome Frame turndown prompt for IE 9 and 10">
- This site is using the retired Chrome Frame plug-in which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser.
- </message>
<message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
New window
</message>
@@ -442,9 +415,6 @@ Google Chrome is unable to recover your settings.
<message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displayed when higher version of the Chrome App Launcher already exists.">
This computer already has a more recent version of the Google Chrome components. Please use a more recent installer.
</message>
- <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chrome Frame is already installed.">
- Google Chrome Frame is already installed and available to all users of this computer. If you want to install Google Chrome Frame at the user level, you must first uninstall the system-level version installed by an administrator.
- </message>
<message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error.">
Installation failed due to unspecified error. If Google Chrome is currently running, please close it and try again.
</message>
@@ -473,7 +443,7 @@ Google Chrome is unable to recover your settings.
You do not have appropriate rights for system-level install. Try running the installer again as Administrator.
</message>
<message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update.">
- No installation of Google Chrome or Google Chrome Frame found to update.
+ No installation of Google Chrome found to update.
</message>
<message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
Uninstallation complete.
@@ -481,17 +451,11 @@ Google Chrome is unable to recover your settings.
<message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Google Chrome version is missing from registry but the installation directory exists and can not be deleted.">
Google Chrome installation directory seems to be in use. Please reboot your computer and try again.
</message>
- <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a multi-install Google Chrome or Google Chrome Frame.">
- A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again.
- </message>
- <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a single-install Google Chrome or Google Chrome Frame.">
- A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again.
- </message>
- <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
- Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome.
+ <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Google Chrome is present, thereby preventing the installation of a single-install Google Chrome.">
+ A conflicting installation of Google Chrome was found on the system. Please uninstall it and try again.
</message>
<message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent.">
- Google Chrome or Google Chrome Frame cannot be updated due to inconsistent Google Update Group Policy settings. Use the Group Policy Editor to set the update policy override for the Google Chrome Binaries application and try again; see http://goo.gl/uJ9gV for details.
+ Google Chrome cannot be updated due to inconsistent Google Update Group Policy settings. Use the Group Policy Editor to set the update policy override for the Google Chrome Binaries application and try again; see http://goo.gl/uJ9gV for details.
</message>
<!-- Options Dialog -->
<message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">

Powered by Google App Engine
This is Rietveld 408576698