diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 09:52:40 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 09:52:40 +0000 |
| commit | 59ffe85f1768f5da3c13381e749156d937af5753 (patch) | |
| tree | c01e3320a817802e5b453a877edacce52409e7e8 /ash/ash_strings.grd | |
| parent | a27ce135cb6a7aa38cf6dfb418b6e4a8185e980e (diff) | |
| download | chromium_src-59ffe85f1768f5da3c13381e749156d937af5753.zip chromium_src-59ffe85f1768f5da3c13381e749156d937af5753.tar.gz chromium_src-59ffe85f1768f5da3c13381e749156d937af5753.tar.bz2 | |
Revert 181896
this change was not at fault
> Revert 181806
>
> Speculative revert to see whether this broke browser_tests on Win Aura Tests(2)
>
> A DCHECK() about invalid strings is hit
>
> > Update NetworkStateListDetailedView, add network_icon::GetImageForTray
> >
> > This integrates chanhes to the network list and icon code,
> > and uses the Ash icon code in the network tray.
> >
> > This completes the changes for:
> > 161869: Create NetworkStateHandler version of Ash network tray
> > (Still behind a flag)
> >
> > BUG=161869
> > TBR=sky@chromium.org (for ash_strings)
> >
> > Review URL: https://codereview.chromium.org/12221112
>
> TBR=stevenjb@chromium.org
> Review URL: https://codereview.chromium.org/12218116
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/12210137
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_strings.grd')
| -rw-r--r-- | ash/ash_strings.grd | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index f60c11b..26b02dd 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -338,6 +338,9 @@ Press Ctrl+Alt+Z to disable. <message name="IDS_ASH_STATUS_TRAY_INITIALIZING_CELLULAR" desc="Message for the status area when initializing the cellular device."> Initializing cellular modem... </message> + <message name="IDS_ASH_STATUS_TRAY_CELLULAR_SCANNING" desc="Message when scanning for cellular networks"> + Searching for cellular networks... + </message> <message name="IDS_ASH_STATUS_TRAY_SMS" desc="The label used in the status tray for SMS."> SMS </message> |