diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 20:40:09 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 20:40:09 +0000 |
| commit | ba7609c2d9ef700a8e21e9cebb019114b3c0bb0c (patch) | |
| tree | fe761b38d93c03956f27584959613b57290c9133 /chrome/app | |
| parent | 78a57b920a55921326650b9afc7ff172775bf966 (diff) | |
| download | chromium_src-ba7609c2d9ef700a8e21e9cebb019114b3c0bb0c.zip chromium_src-ba7609c2d9ef700a8e21e9cebb019114b3c0bb0c.tar.gz chromium_src-ba7609c2d9ef700a8e21e9cebb019114b3c0bb0c.tar.bz2 | |
Merge 63488 - Wired cellular data plan activation logic with the rest of the DOM UI on both chrome:settings/internet and chrome:mobilesetup pages.
Fixed some minor internet settings formatting issues while I was already there.
BUG=chromium-os:6987, chromium-os:7619, chromium-os:7546
TEST=make sure cellular connection can be activated from chrome:settings
Review URL: http://codereview.chromium.org/3744013
TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/4023004
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@63559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e1f0baa..5133004 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -9034,6 +9034,9 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_SETTINGS_FORGET" desc="In the settings tab, the text on the button to forget this network."> Forget this network </message> + <message name="IDS_OPTIONS_SETTINGS_ACTIVATE" desc="In the settings tab, the text on the button to activate a cellular network."> + Activate + </message> <message name="IDS_OPTIONS_SETTINGS_OPTIONS" desc="In the settings tab, the text on the button to display more options."> Options... </message> |