summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 00:06:08 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-14 00:06:08 +0000
commit3266c2b9cc63c1a4533f8e99cb535f30e67e5499 (patch)
tree58e0ab9c7259a575f2d4abd8da7bda731b0f14b3 /chrome/app
parentf6231b17e8a950570602ed4b6e99d08f8f9f85f6 (diff)
downloadchromium_src-3266c2b9cc63c1a4533f8e99cb535f30e67e5499.zip
chromium_src-3266c2b9cc63c1a4533f8e99cb535f30e67e5499.tar.gz
chromium_src-3266c2b9cc63c1a4533f8e99cb535f30e67e5499.tar.bz2
Add status area to Aura builds.
BUG=97263 TEST=Test status area buttons and associated menus in aura + win / linux / chromeos. (Only the clock and --memory-widget icon will show up on non-chromeos) Review URL: http://codereview.chromium.org/8509027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd14
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cc2d66c..bc92b7a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11487,6 +11487,14 @@ Keep your key file in a safe place. You will need it to create new versions of y
Show all downloads
</message>
+ <!-- Status Area Strings (not ChromeOS specifc) -->
+ <message name="IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG" desc="The menu item in the clock menu button for opening the options dialog">
+ Open date and time options...
+ </message>
+ <message name="IDS_STATUSBAR_CLOCK_TOOLTIP" desc="Tooltip for the clock in the status bar.">
+ <ph name="DATE">$1<ex>Aug 16, 2010</ex></ph>
+ </message>
+
<!-- Imageburn Strings -->
<if expr="pp_ifdef('chromeos')">
<message name="IDS_CHECKING_FOR_UPDATES" desc="Notification for checking for update">
@@ -13210,9 +13218,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_STATUSBAR_CAPS_LOCK_ENABLED_PRESS_SEARCH" desc="The tooltip for the caps lock indicator button.">
CAPS LOCK is on.\nPress Search key to cancel
</message>
- <message name="IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG" desc="The menu item in the clock menu button for opening the options dialog">
- Open date and time options...
- </message>
<message name="IDS_STATUSBAR_BATTERY_CHARGING_PERCENTAGE" desc="In the power menu button, this shows what percentage of battery is left when power supply is connected.">
Charging battery: <ph name="PRECENTAGE">$1<ex>100</ex></ph>%
</message>
@@ -13252,9 +13257,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP" desc="Tooltip for the network menu status bar icon when connected to a network.">
Connected to <ph name="NAME">$1<ex>GoogleGuest</ex></ph>
</message>
- <message name="IDS_STATUSBAR_CLOCK_TOOLTIP" desc="Tooltip for the clock in the status bar.">
- <ph name="DATE">$1<ex>Aug 16, 2010</ex></ph>
- </message>
<message name="IDS_STATUSBAR_WINDOW_MAXIMIZE_TOOLTIP" desc="Tooltip for the layout mode button in the status bar when the window is unmaximized.">
Maximize
</message>