Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 27635002: Content settings for <audio> and <video>. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « no previous file | chrome/app/theme/default_100_percent/common/allowed_media.png » ('j') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2f6ddb5843e8c133c4b9df6069c9c1e4d7511a8f..a0ffda921d83d3c88164086080226a5aed69d910 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -350,6 +350,9 @@ are declared in build/common.gypi.
<message name="IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT" desc="The label used for JavaScript permission controls in the Website Settings popup.">
JavaScript
</message>
+ <message name="IDS_WEBSITE_SETTINGS_TYPE_MEDIA" desc="The label used for sounds and videos permission controls in the Website Settings popup.">
+ Sounds and videos
Bernhard Bauer 2014/07/01 09:12:50 We usually use the term "audio" instead of "sounds
+ </message>
<message name="IDS_WEBSITE_SETTINGS_TYPE_POPUPS" desc="The label used for popups permission controls in the Website Settings popup.">
Popups
</message>
@@ -2314,21 +2317,33 @@ Even if you have downloaded files from this website before, the website might ha
<message name="IDS_BLOCKED_IMAGES_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to display images.">
Images were blocked on this page.
</message>
+ <message name="IDS_BLOCKED_MEDIA_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to play media.">
+ Media (sound and/or video) was blocked on this page.
+ </message>
<message name="IDS_BLOCKED_COOKIES_UNBLOCK" desc="Radio button choice to unblock a site from setting cookies, displayed in bubble when a page tries to set cookies.">
Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to set cookies
</message>
<message name="IDS_BLOCKED_IMAGES_UNBLOCK" desc="Radio button choice to unblock a site from showing images, displayed in bubble when a page tries to display images.">
Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to show images
</message>
+ <message name="IDS_BLOCKED_MEDIA_UNBLOCK" desc="Radio button choice to unblock a site from playing sounds and videos, displayed in bubble when a page tries to play a sound or a video.">
+ Always allow <ph name="HOST">$1<ex>mail.google.com</ex></ph> to play sounds and videos
+ </message>
<message name="IDS_BLOCKED_COOKIES_NO_ACTION" desc="Radio button choice to continue blocking a site from setting cookies, displayed in bubble when a page tries to set cookies.">
Continue blocking cookies
</message>
<message name="IDS_BLOCKED_IMAGES_NO_ACTION" desc="Radio button choice to continue blocking a site from showing images, displayed in bubble when a page tries to display images.">
Continue blocking images
</message>
+ <message name="IDS_BLOCKED_MEDIA_NO_ACTION" desc="Radio button choice to continue blocking a site from playing sounds and videos, displayed in bubble when a page tries to play a sound or a video.">
+ Continue blocking sounds and videos
+ </message>
<message name="IDS_BLOCKED_IMAGES_LINK" desc="Link to images section of content blocking management dialog, displayed in bubble when a page tries to display images.">
Manage image blocking...
</message>
+ <message name="IDS_BLOCKED_MEDIA_LINK" desc="Link to images section of content blocking management dialog, displayed in bubble when a page tries to play sounds and/or videos.">
+ Manage sound and video blocking...
+ </message>
<message name="IDS_BLOCKED_POPUPS_TOOLTIP" desc="Tooltip text when a page is not allowed to display popups.">
Pop-ups were blocked on this page.
</message>
@@ -7718,6 +7733,18 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_IMAGES_NOLOAD_RADIO" desc="A radio button in the Content Settings dialog for preventing loading any image.">
Do not show any images
</message>
+ <message name="IDS_MEDIA_TAB_LABEL" desc="Label for Sounds tab on Content Settings dialog">
+ Media
Bernhard Bauer 2014/07/01 09:12:49 We should probably decide whether we want to use t
+ </message>
+ <message name="IDS_MEDIA_HEADER" desc="Header for media exception management page on Content Settings dialog">
+ Media exceptions
+ </message>
+ <message name="IDS_MEDIA_LOAD_RADIO" desc="A radio button in the Content Settings dialog for allowing all sounds and videos to be loaded.">
+ Play all sounds and videos (recommended)
+ </message>
+ <message name="IDS_MEDIA_NOLOAD_RADIO" desc="A radio button in the Content Settings dialog for preventing loading any sound or video.">
+ Do not play any sounds or videos
+ </message>
<message name="IDS_POPUP_TAB_LABEL" desc="Label for Pop-up Windows tab on Content Settings dialog">
Pop-ups
</message>
« no previous file with comments | « no previous file | chrome/app/theme/default_100_percent/common/allowed_media.png » ('j') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698