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

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

Issue 2858032: Display content settings applying to the current otr session only. (Closed)
Patch Set: updates Created 10 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/app/nibs/ContentExceptionsWindow.xib » ('j') | no next file with comments »
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 4451 matching lines...) Expand 10 before | Expand all | Expand 10 after
4462 4462
4463 <message name="IDS_EXCEPTIONS_HOSTNAME_HEADER" desc="A column header for t he hostname column of the cookie/image/javascript/plugins exceptions dialog"> 4463 <message name="IDS_EXCEPTIONS_HOSTNAME_HEADER" desc="A column header for t he hostname column of the cookie/image/javascript/plugins exceptions dialog">
4464 Site 4464 Site
4465 </message> 4465 </message>
4466 <message name="IDS_EXCEPTIONS_PATTERN_HEADER" desc="A column header for th e pattern column of the cookie/image/javascript/plugins exceptions dialog"> 4466 <message name="IDS_EXCEPTIONS_PATTERN_HEADER" desc="A column header for th e pattern column of the cookie/image/javascript/plugins exceptions dialog">
4467 Pattern 4467 Pattern
4468 </message> 4468 </message>
4469 <message name="IDS_EXCEPTIONS_ACTION_HEADER" desc="A column header for the action column of the cookie/image/javascript/plugins exceptions dialog"> 4469 <message name="IDS_EXCEPTIONS_ACTION_HEADER" desc="A column header for the action column of the cookie/image/javascript/plugins exceptions dialog">
4470 Action 4470 Action
4471 </message> 4471 </message>
4472 <message name="IDS_EXCEPTIONS_OTR_HEADER" desc="A column header for the in cognito column of the cookie/image/javascript/plugins exceptions dialog">
4473 Incognito
4474 </message>
4472 <message name="IDS_EXCEPTIONS_ADD_BUTTON" desc="A button in the cookie/ima ge/javascript/plugins exceptions dialog for adding new exception rules."> 4475 <message name="IDS_EXCEPTIONS_ADD_BUTTON" desc="A button in the cookie/ima ge/javascript/plugins exceptions dialog for adding new exception rules.">
4473 Add... 4476 Add...
4474 </message> 4477 </message>
4475 <message name="IDS_EXCEPTIONS_EDIT_BUTTON" desc="A button in the cookie/im age/javascript/plugins exceptions dialog for editing an exception."> 4478 <message name="IDS_EXCEPTIONS_EDIT_BUTTON" desc="A button in the cookie/im age/javascript/plugins exceptions dialog for editing an exception.">
4476 Edit... 4479 Edit...
4477 </message> 4480 </message>
4478 <message name="IDS_EXCEPTIONS_REMOVE_BUTTON" desc="A button in exception d ialogs for removing individual exception rules."> 4481 <message name="IDS_EXCEPTIONS_REMOVE_BUTTON" desc="A button in exception d ialogs for removing individual exception rules.">
4479 Remove 4482 Remove
4480 </message> 4483 </message>
4481 <message name="IDS_EXCEPTIONS_REMOVEALL_BUTTON" desc="A button in exceptio n dialogs for removing all exception rules."> 4484 <message name="IDS_EXCEPTIONS_REMOVEALL_BUTTON" desc="A button in exceptio n dialogs for removing all exception rules.">
4482 Remove All 4485 Remove All
4483 </message> 4486 </message>
4484 <message name="IDS_EXCEPTIONS_ALLOW_BUTTON" desc="A label to display in th e exception page's action column when a site's content setting is allowed for a given domain"> 4487 <message name="IDS_EXCEPTIONS_ALLOW_BUTTON" desc="A label to display in th e exception page's action column when a site's content setting is allowed for a given domain">
4485 Allow 4488 Allow
4486 </message> 4489 </message>
4487 <message name="IDS_EXCEPTIONS_ASK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is set to promt for a given domain."> 4490 <message name="IDS_EXCEPTIONS_ASK_BUTTON" desc="A label to display in the exception page's action column when a site's content setting is set to promt for a given domain.">
4488 Ask 4491 Ask
4489 </message> 4492 </message>
4490 <message name="IDS_EXCEPTIONS_BLOCK_BUTTON" desc="A label to display in th e exception page's action column when a site's content setting is blocked for a given domain."> 4493 <message name="IDS_EXCEPTIONS_BLOCK_BUTTON" desc="A label to display in th e exception page's action column when a site's content setting is blocked for a given domain.">
4491 Block 4494 Block
4492 </message> 4495 </message>
4496 <message name="IDS_EXCEPTIONS_OTR_IN_ITALICS" desc="A label informing the user that incognito-only exceptions are displayed in italics">
4497 Exceptions displayed in italics only apply to this incognito session.
4498 </message>
4493 <message name="IDS_EXCEPTIONS_NOT_SET_BUTTON" desc="A label to display in the exception page's action column when a site's content setting has not yet bee n set for a given domain."> 4499 <message name="IDS_EXCEPTIONS_NOT_SET_BUTTON" desc="A label to display in the exception page's action column when a site's content setting has not yet bee n set for a given domain.">
4494 Not set 4500 Not set
4495 </message> 4501 </message>
4496 <message name="IDS_EXCEPTIONS_SAMPLE_HOST" desc="Exceptions page view's ho st entry field's watermark - example host name. Users will see this text before they start typing host name in the field."> 4502 <message name="IDS_EXCEPTIONS_SAMPLE_HOST" desc="Exceptions page view's ho st entry field's watermark - example host name. Users will see this text before they start typing host name in the field.">
4497 example.com 4503 example.com
4498 </message> 4504 </message>
4499 <message name="IDS_EXCEPTIONS_SAMPLE_PATTERN" desc="Exceptions page view's pattern entry field's watermark - example pattern. Users will see this text bef ore they start typing pattern in the field."> 4505 <message name="IDS_EXCEPTIONS_SAMPLE_PATTERN" desc="Exceptions page view's pattern entry field's watermark - example pattern. Users will see this text bef ore they start typing pattern in the field.">
4500 [*.]example.com 4506 [*.]example.com
4501 </message> 4507 </message>
4502 <message name="IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST" desc="Template text for a child row in the Geolocation Exceptions page view. Controls the perm ission setting for the parent page when embedded on the specified site."> 4508 <message name="IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST" desc="Template text for a child row in the Geolocation Exceptions page view. Controls the perm ission setting for the parent page when embedded on the specified site.">
(...skipping 12 matching lines...) Expand all
4515 </message> 4521 </message>
4516 <message name="IDS_EXCEPTION_EDITOR_HOST_TITLE" desc="Title of the host fi eld in the exception editor"> 4522 <message name="IDS_EXCEPTION_EDITOR_HOST_TITLE" desc="Title of the host fi eld in the exception editor">
4517 Host: 4523 Host:
4518 </message> 4524 </message>
4519 <message name="IDS_EXCEPTION_EDITOR_PATTERN_TITLE" desc="Title of the patt ern field in the exception editor"> 4525 <message name="IDS_EXCEPTION_EDITOR_PATTERN_TITLE" desc="Title of the patt ern field in the exception editor">
4520 Pattern: 4526 Pattern:
4521 </message> 4527 </message>
4522 <message name="IDS_EXCEPTION_EDITOR_ACTION_TITLE" desc="Title of the actio n combobox in the exception editor"> 4528 <message name="IDS_EXCEPTION_EDITOR_ACTION_TITLE" desc="Title of the actio n combobox in the exception editor">
4523 Action: 4529 Action:
4524 </message> 4530 </message>
4531 <message name="IDS_EXCEPTION_EDITOR_OTR_TITLE" desc="Title of the incognit o checkbox in the exception editor">
4532 Only apply to this incognito session
4533 </message>
4525 4534
4526 <!-- Cookie alert dialog --> 4535 <!-- Cookie alert dialog -->
4527 <message name="IDS_COOKIE_ALERT_TITLE" desc="Format string for cookie aler t dialog title"> 4536 <message name="IDS_COOKIE_ALERT_TITLE" desc="Format string for cookie aler t dialog title">
4528 Cookie from <ph name="HOST">$1<ex>www.google.com</ex></ph> 4537 Cookie from <ph name="HOST">$1<ex>www.google.com</ex></ph>
4529 </message> 4538 </message>
4530 <message name="IDS_DATA_ALERT_TITLE" desc="Format string for data storing alert dialog title"> 4539 <message name="IDS_DATA_ALERT_TITLE" desc="Format string for data storing alert dialog title">
4531 Data from <ph name="HOST">$1<ex>www.google.com</ex></ph> 4540 Data from <ph name="HOST">$1<ex>www.google.com</ex></ph>
4532 </message> 4541 </message>
4533 <message name="IDS_COOKIE_ALERT_LABEL" desc="Format string for a label on top of cookie alert dialog"> 4542 <message name="IDS_COOKIE_ALERT_LABEL" desc="Format string for a label on top of cookie alert dialog">
4534 <ph name="HOST">$1<ex>www.google.com</ex></ph> wants to create a cookie on your computer. 4543 <ph name="HOST">$1<ex>www.google.com</ex></ph> wants to create a cookie on your computer.
(...skipping 4083 matching lines...) Expand 10 before | Expand all | Expand 10 after
8618 8627
8619 </messages> 8628 </messages>
8620 8629
8621 <structures first_id="50000" fallback_to_english="true"> 8630 <structures first_id="50000" fallback_to_english="true">
8622 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 8631 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
8623 </structure> 8632 </structure>
8624 </structures> 8633 </structures>
8625 8634
8626 </release> 8635 </release>
8627 </grit> 8636 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/nibs/ContentExceptionsWindow.xib » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698