| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index e60fe7294a61f6ff9dea657e8a3e4264a64e1c17..6c74c62e764b275a90f9c8bd4d5abfc414b105c7 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -10920,6 +10920,7 @@ Some features may be unavailable. Please check that the profile exists and you
|
| Type your search query here
|
| </message>
|
|
|
| +
|
| <!-- Sync strings -->
|
|
|
| <!-- Sync options dialog strings -->
|
| @@ -15692,6 +15693,26 @@ Battery full
|
| Devices
|
| </message>
|
|
|
| + <!-- Media Stream status tray -->
|
| + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_ITEM_AUDIO" desc="Text to display in the MediaStrem tray list when the audio device is being used">
|
| + <ph name="HOST">$1<ex>html5rocks.com</ex></ph> is using <ph name="MIC_NAME">$2<ex>Built-in microphone</ex></ph> for capturing audio.
|
| + </message>
|
| + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_ITEM_VIDEO" desc="Text to display in the MediaStrem tray list when the video device is being used">
|
| + <ph name="HOST">$1<ex>html5rocks.com</ex></ph> is using <ph name="CAMERA_NAME">$2<ex>Built-in camera</ex></ph> for capturing video.
|
| + </message>
|
| + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TOOLTIP" desc="Tool tip for the capture notification status tray shown by the Media Stream">
|
| + MediaStream is currently using the capture device(s).
|
| + </message>
|
| + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_TITLE" desc="Title of the capture notification status tray shown Media Stream when using capture device">
|
| + MediaStream is running
|
| + </message>
|
| + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_TITLE" desc="Title of the balloon shown by the tray notification icon evert time media stream starts capturing using a camera and/or a microphone">
|
| + MediaStream is using capture device(s).
|
| + </message>
|
| + <message name="IDS_MEDIA_STREAM_STATUS_TRAY_BALLOON_BODY" desc="Contents of the balloon shown by the tray notification icon evert time media stream starts captureing audio using a microphone">
|
| + <ph name="HOST">$1<ex>html5rocks.com</ex></ph> is using MediaStream for capturing. Look for the media stream notification icon to know which devices have been used.
|
| + </message>
|
| +
|
| <!-- Quota messages -->
|
| <if expr="pp_ifdef('android')">
|
| <message name="IDS_REQUEST_QUOTA_INFOBAR_QUESTION" desc="Mobile: For mobile device. Question asked on the info bar whenever webapp requests new (larger) quota to persistently store data on the mobile device (e.g. for persistent-type filesystem).">
|
|
|