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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 6207005: Clarify wording around blocking 3rd party cookies and add lab to block reading of 3rd party cookies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | net/base/static_cookie_policy.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 4200 matching lines...) Expand 10 before | Expand all | Expand 10 after
4211 </message> 4211 </message>
4212 <message name="IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_DESCRIPTION" desc="Des cription of the 'Disable hyperlink auditing' lab."> 4212 <message name="IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_DESCRIPTION" desc="Des cription of the 'Disable hyperlink auditing' lab.">
4213 Disable sending hyperlink auditing pings. 4213 Disable sending hyperlink auditing pings.
4214 </message> 4214 </message>
4215 <message name="IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_NAME" desc="Name o f the 'Enable experimental location features' lab."> 4215 <message name="IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_NAME" desc="Name o f the 'Enable experimental location features' lab.">
4216 Experimental location features 4216 Experimental location features
4217 </message> 4217 </message>
4218 <message name="IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_DESCRIPTION" desc= "Description of the 'Enable experimental location features' lab."> 4218 <message name="IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_DESCRIPTION" desc= "Description of the 'Enable experimental location features' lab.">
4219 Enables experimental extensions to the geolocation feature. Includes usi ng operating system location APIs (where available), and sending additional loca l network configuration data to the Google location service to provide higher ac curacy positioning. 4219 Enables experimental extensions to the geolocation feature. Includes usi ng operating system location APIs (where available), and sending additional loca l network configuration data to the Google location service to provide higher ac curacy positioning.
4220 </message> 4220 </message>
4221 <message name="IDS_FLAGS_BLOCK_ALL_THIRD_PARTY_COOKIES_NAME" desc="Name of the 'Block all third-party cookies' lab.">
4222 Block all third-party cookies
4223 </message>
4224 <message name="IDS_FLAGS_BLOCK_ALL_THIRD_PARTY_COOKIES_DESCRIPTION" desc=" Description of the 'Block all third-party cookies' lab.">
4225 When the option to block third-party cookies from being set is enabled, also block third-party cookies from being read.
4226 </message>
4221 4227
4222 <!-- Instant --> 4228 <!-- Instant -->
4223 <message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibo x dropdown for enabling instant"> 4229 <message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibo x dropdown for enabling instant">
4224 Enable... 4230 Enable...
4225 </message> 4231 </message>
4226 <message name="IDS_INSTANT_OPT_IN_NO_THANKS" desc="Button shown in the omn ibox dropdodown for not enabling instant"> 4232 <message name="IDS_INSTANT_OPT_IN_NO_THANKS" desc="Button shown in the omn ibox dropdodown for not enabling instant">
4227 No thanks 4233 No thanks
4228 </message> 4234 </message>
4229 <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant"> 4235 <message name="IDS_INSTANT_OPT_IN_LABEL" desc="Label shown in the omnibox dropdown for enabling instant">
4230 Enable Instant for faster searching and browsing? 4236 Enable Instant for faster searching and browsing?
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
5181 <message name="IDS_COOKIES_ASK_EVERY_TIME_RADIO" desc="A radio button in t he Content Settings dialog for asking to store cookies and other site data on yo ur computer every time."> 5187 <message name="IDS_COOKIES_ASK_EVERY_TIME_RADIO" desc="A radio button in t he Content Settings dialog for asking to store cookies and other site data on yo ur computer every time.">
5182 Ask me when a site tries to set data 5188 Ask me when a site tries to set data
5183 </message> 5189 </message>
5184 <message name="IDS_COOKIES_BLOCK_RADIO" desc="A radio button in the Conten t Settings dialog for blocking cookies and other site data from being stored on your computer."> 5190 <message name="IDS_COOKIES_BLOCK_RADIO" desc="A radio button in the Conten t Settings dialog for blocking cookies and other site data from being stored on your computer.">
5185 Block sites from setting any data 5191 Block sites from setting any data
5186 </message> 5192 </message>
5187 <message name="IDS_COOKIES_EXCEPTIONS_BUTTON" desc="A button in the Conten t Settings dialog for opening cookie storing exception rules dialog."> 5193 <message name="IDS_COOKIES_EXCEPTIONS_BUTTON" desc="A button in the Conten t Settings dialog for opening cookie storing exception rules dialog.">
5188 Exceptions... 5194 Exceptions...
5189 </message> 5195 </message>
5190 <message name="IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX" desc="A checkbox in the Content Settings dialog for blocking all 3rd party cookies."> 5196 <message name="IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX" desc="A checkbox in the Content Settings dialog for blocking all 3rd party cookies.">
5191 Block all third-party cookies without exception 5197 Ignore exceptions and block third-party cookies from being set
5192 </message> 5198 </message>
5193 5199
5194 <!-- Mac users do not close their browser; they quit it. --> 5200 <!-- Mac users do not close their browser; they quit it. -->
5195 <if expr="os != 'darwin'"> 5201 <if expr="os != 'darwin'">
5196 <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is closed." > 5202 <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is closed." >
5197 Clear cookies and other site data when I close my browser 5203 Clear cookies and other site data when I close my browser
5198 </message> 5204 </message>
5199 </if> 5205 </if>
5200 <if expr="os == 'darwin'"> 5206 <if expr="os == 'darwin'">
5201 <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is quit (Ma c)."> 5207 <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is quit (Ma c).">
(...skipping 6429 matching lines...) Expand 10 before | Expand all | Expand 10 after
11631 </includes> 11637 </includes>
11632 <structures fallback_to_english="true"> 11638 <structures fallback_to_english="true">
11633 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 11639 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
11634 </structure> 11640 </structure>
11635 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 11641 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
11636 </structure> 11642 </structure>
11637 </structures> 11643 </structures>
11638 11644
11639 </release> 11645 </release>
11640 </grit> 11646 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | net/base/static_cookie_policy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698