summaryrefslogtreecommitdiffstats
path: root/chrome/app/generated_resources.grd
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 22:11:37 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 22:11:37 +0000
commitc998dac78d2606ebb4154d688277ff654aab0fb4 (patch)
tree62dcb6566449dcf2b17908c24c0689b85a920a5f /chrome/app/generated_resources.grd
parenta425003c6df626407c31625e2ac9a62f311b9a16 (diff)
downloadchromium_src-c998dac78d2606ebb4154d688277ff654aab0fb4.zip
chromium_src-c998dac78d2606ebb4154d688277ff654aab0fb4.tar.gz
chromium_src-c998dac78d2606ebb4154d688277ff654aab0fb4.tar.bz2
[tabbed options] more work on content settings exceptions lists
- tie "edit" mode to "selected" -- selecting enters into edit mode -- blurring exits edit mode and deselects - fix up layout within rows (faux columns) - add a special "add new exception" row (this should be at the bottom of the table, but it's currently at the top) - change behavior when the user attempts to commit an invalid exception. Instead of trying to regrab focus, just revert the row to its previous state. TODO: list should be sized dynamically, i.e. no scrollbar. TODO: list should be in sub-sub dialog TODO: rows should have delete X BUG=64153 TEST=manual Review URL: http://codereview.chromium.org/5699004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/generated_resources.grd')
-rw-r--r--chrome/app/generated_resources.grd5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 110f36b..e6237af 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5329,9 +5329,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_EXCEPTIONS_OTR_LABEL" desc="A label informing the user that the table below the label shows incognito-only exceptions">
Exceptions below only apply to the current incognito session.
</message>
- <message translateable="false" name="IDS_EXCEPTIONS_PATTERN_EXAMPLE" desc="Placeholder text when the user adds a new exception" >
+ <message translateable="false" name="IDS_EXCEPTIONS_PATTERN_EXAMPLE" desc="Example pattern when the user is adding a new exception" >
[*.]example.com
</message>
+ <message name="IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS" desc="Placeholder text before the user adds a new exception" >
+ Add a new exception pattern
+ </message>
<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 been set for a given domain.">
Not set
</message>