diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 06:43:55 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 06:43:55 +0000 |
| commit | a342ce140673b2a40e400862b385dd6e42ded4b0 (patch) | |
| tree | 1e7680fdf31dc900df968e3d54dffd842f3755eb /chrome/app | |
| parent | baf6b36c4aeb3dd0bd7a407836d45a8a91eae5b2 (diff) | |
| download | chromium_src-a342ce140673b2a40e400862b385dd6e42ded4b0.zip chromium_src-a342ce140673b2a40e400862b385dd6e42ded4b0.tar.gz chromium_src-a342ce140673b2a40e400862b385dd6e42ded4b0.tar.bz2 | |
Show "Update Chrome OS" in the wrench menu, when the update image is ready.
Along the way, replace "About Chrome" with "About Chrome OS" in the wrench menu.
TEST=Connect to a dev server with a newer version, and check that the menu item appears, and the dialog works.
BUG=chromium-os:6526
BUG=chromium-os:7847
Review URL: http://codereview.chromium.org/3858002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6632245..8b2af54 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8644,9 +8644,16 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> <!-- Update Recommended dialog --> - <message name="IDS_UPDATE_RECOMMENDED" desc="The main text of the Update Recommended dialog."> - <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is out of date because it hasn't been restarted in a while. An update is available and will be applied as soon as you restart. - </message> + <if expr="not pp_ifdef('chromeos')"> + <message name="IDS_UPDATE_RECOMMENDED" desc="The main text of the Update Recommended dialog."> + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is out of date because it hasn't been restarted in a while. An update is available and will be applied as soon as you restart. + </message> + </if> + <if expr="pp_ifdef('chromeos')"> + <message name="IDS_UPDATE_RECOMMENDED" desc="The main text of the Update Recommended dialog."> + <ph name="PRODUCT_NAME">$1<ex>Google Chrome OS</ex></ph> needs to be restarted to apply the update. + </message> + </if> <message name="IDS_RESTART_AND_UPDATE" desc="The button label for restarting and updating Chrome."> Restart </message> @@ -8889,7 +8896,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Finalizing system update… </message> <message name="IDS_UPDATE_COMPLETED" desc="Notification for update completed"> - System update complete. Please restart the system by pressing the power button, wait for the system to power down, then press the power button again. + System update complete. Please restart the system. </message> <message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates installation screen during OOBE"> Please wait while <ph name="PRODUCT_NAME">$1<ex>Chrome OS</ex></ph> installs the latest system updates. |