summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 06:22:25 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-24 06:22:25 +0000
commit0766be5b872ca6e416338639eaae68eb4c42d36d (patch)
tree42135933aad2966c463e4dd2c2a7be5cd4a9964d /chrome/app
parent0e4dcafd7ef96ac39685301883b0626335e996df (diff)
downloadchromium_src-0766be5b872ca6e416338639eaae68eb4c42d36d.zip
chromium_src-0766be5b872ca6e416338639eaae68eb4c42d36d.tar.gz
chromium_src-0766be5b872ca6e416338639eaae68eb4c42d36d.tar.bz2
Fix the release channel switching UI for Chrome OS.
Remove "canary" as it's not yet supported as of now. Add warning text on the channel swtiching UI. BUG=chromium-os:9597 TEST=confirmed that the canary is gone and the warning text appears. Review URL: http://codereview.chromium.org/5256003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 779efbf..1a4b0d4 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6528,6 +6528,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_ABOUT_PAGE_CHANNEL_CANARY" desc="The canary option in the channel select.">
Canary
</message>
+ <message name="IDS_ABOUT_PAGE_CHANNEL_WARNING_HEADER" desc="Text right before the warning body text.">
+ WARNING
+ </message>
+ <message name="IDS_ABOUT_PAGE_CHANNEL_WARNING_TEXT" desc="The warning text show on the release channel switching UI.">
+ The development channel is where ideas get tested, but can be very unstable at times. Please proceed with caution.
+ </message>
<message name="IDS_ABOUT_PAGE_CHECK_NOW" desc="Button title for checking for updates now.">
Check For Update
</message>