diff options
author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 11:33:38 +0000 |
---|---|---|
committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 11:33:38 +0000 |
commit | 4606df6950d9699c9ae45a53d1baf81c5fd6ecdb (patch) | |
tree | 8017d000cec5895747ab3d54a6b1478577ca84c2 /chrome/app | |
parent | c4e14acfa731f1a51c0a0053cd48707de45369ea (diff) | |
download | chromium_src-4606df6950d9699c9ae45a53d1baf81c5fd6ecdb.zip chromium_src-4606df6950d9699c9ae45a53d1baf81c5fd6ecdb.tar.gz chromium_src-4606df6950d9699c9ae45a53d1baf81c5fd6ecdb.tar.bz2 |
#1, Use chrome/chromium logo icon for the balloon.
#2, If the tile of the web page is URL, use security origin as the displayed string.
#3, Activate the tab when the user clicks on the icon menu.
#4, Get rid of and/or, use and or no and.
BUG=127404
Review URL: https://chromiumcodereview.appspot.com/10391029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/generated_resources.grd | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 5b8f33f6..9f3ea95 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -16017,19 +16017,22 @@ Battery full <message name="IDS_MEDIA_STREAM_STATUS_TRAY_MENU_ITEM" desc="Title of the web page to display in the capture tray icon menu when it is using the capture devices"> <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> </message> - <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TOOLTIP" desc="Tool tip for the capture status tray icon"> - <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your camera and/or microphone. + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_AND_VIDEO" desc="Tool tip for the capture status tray icon when microphone and camera are being used"> + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your camera and microphone. </message> - <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_TITLE" desc="Title of the balloon shown by the tray notification icon every time MediaStream starts capturing using a camera and/or a microphone"> - <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your camera and/or microphone. + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY" desc="Tool tip for the capture status tray icon when microphone is being used"> + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your microphone. </message> - <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_AUDIO_AND_VIDEO" desc="Contents of the balloon shown by the tray notification icon every time MediaStream starts capturing"> + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY" desc="Tool tip for the capture status tray icon when camera is being used"> + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your camera. + </message> + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_AUDIO_AND_VIDEO" desc="Contents of the balloon shown by the tray notification icon every time camera and microphone are used"> <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> is using your camera and microphone. </message> - <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_AUDIO_ONLY" desc="Contents of the balloon shown by the tray notification icon every time MediaStream starts capturing"> + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_AUDIO_ONLY" desc="Contents of the balloon shown by the tray notification icon every time microphone is used"> <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> is using your microphone. </message> - <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_VIDEO_ONLY" desc="Contents of the balloon shown by the tray notification icon every time MediaStream starts capturing"> + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY_VIDEO_ONLY" desc="Contents of the balloon shown by the tray notification icon every time camera is used"> <ph name="TITLE">$1<ex>html5rocks.com</ex></ph> is using your camera. </message> |