summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-17 23:11:47 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-17 23:11:47 +0000
commit0f32ec93edba7542a5115ebc96323889800c95da (patch)
tree889e437bcf39179ace13b3c3e755f33a784683fb /chrome
parent219f9cee50526e18c905f296eb07d9df5f5b0b03 (diff)
downloadchromium_src-0f32ec93edba7542a5115ebc96323889800c95da.zip
chromium_src-0f32ec93edba7542a5115ebc96323889800c95da.tar.gz
chromium_src-0f32ec93edba7542a5115ebc96323889800c95da.tar.bz2
[ChromeOS] Reword "when I close my browser" in settings.
BUG=chromium-os:21919 TEST=Verify fix for chromium-os:21919. Review URL: http://codereview.chromium.org/9240021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2d4005b0..c67c7b7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5979,8 +5979,8 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
Web Intents
</message>
- <!-- Mac users do not close their browser; they quit it. -->
- <if expr="not is_macosx">
+ <!-- Mac and ChromeOS users do not close their browser. Mac users quit it and ChromeOS users log out. -->
+ <if expr="not is_macosx and not pp_ifdef('chromeos')">
<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.">
Clear cookies and other site data when I close my browser
</message>
@@ -5996,6 +5996,14 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
Clear cookies and other site and plug-in data when I quit my browser
</message>
</if>
+ <if expr="pp_ifdef('chromeos')">
+ <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.">
+ Clear cookies and other site data when I log out
+ </message>
+ <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in the Content Settings dialog for removing all cookies on when browser is closed.">
+ Clear cookies and other site and plug-in data when I log out
+ </message>
+ </if>
<message name="IDS_IMAGES_TAB_LABEL" desc="Label for Images tab on Content Settings dialog">
Images