summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/dom_ui/options/about_page_handler.cc1
-rw-r--r--chrome/browser/resources/options/about_page.html1
3 files changed, 5 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2e6ac1c..f487538 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6430,6 +6430,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT" desc="The development option in the channel select.">
Development
</message>
+ <message name="IDS_ABOUT_PAGE_CHANNEL_CANARY" desc="The canary option in the channel select.">
+ Canary
+ </message>
<message name="IDS_ABOUT_PAGE_CHECK_NOW" desc="Button title for checking for updates now.">
Check For Update
</message>
diff --git a/chrome/browser/dom_ui/options/about_page_handler.cc b/chrome/browser/dom_ui/options/about_page_handler.cc
index 8bb23537..cb24290 100644
--- a/chrome/browser/dom_ui/options/about_page_handler.cc
+++ b/chrome/browser/dom_ui/options/about_page_handler.cc
@@ -80,6 +80,7 @@ const LocalizeEntry localize_table[] = {
{ "release", IDS_ABOUT_PAGE_CHANNEL_RELEASE },
{ "beta", IDS_ABOUT_PAGE_CHANNEL_BETA },
{ "development", IDS_ABOUT_PAGE_CHANNEL_DEVELOPMENT },
+ { "canary", IDS_ABOUT_PAGE_CHANNEL_CANARY },
{ "user_agent", IDS_ABOUT_VERSION_USER_AGENT },
{ "command_line", IDS_ABOUT_VERSION_COMMAND_LINE },
{ "aboutPage", IDS_ABOUT_PAGE_TITLE }
diff --git a/chrome/browser/resources/options/about_page.html b/chrome/browser/resources/options/about_page.html
index edcd1e9..d531815 100644
--- a/chrome/browser/resources/options/about_page.html
+++ b/chrome/browser/resources/options/about_page.html
@@ -25,6 +25,7 @@
<!-- <option value="release" i18n-content="release"></option> -->
<option value="beta-channel" i18n-content="beta"></option>
<option value="dev-channel" i18n-content="development"></option>
+ <option value="canary-channel" i18n-content="canary"></option>
</select>
</section>
<section>