summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 07:37:06 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 07:37:06 +0000
commit91390f66fe2393cb7842d2636dc8821950f7c5cb (patch)
treea261f882e0ac394d8d8a3c4869000f08570f0320 /chrome
parent1faee3f0c048f4e8f7cb165497376ec09e3155e1 (diff)
downloadchromium_src-91390f66fe2393cb7842d2636dc8821950f7c5cb.zip
chromium_src-91390f66fe2393cb7842d2636dc8821950f7c5cb.tar.gz
chromium_src-91390f66fe2393cb7842d2636dc8821950f7c5cb.tar.bz2
Change the message used by RestartMessageBox for Chromium OS.
TEST=manual BUG=chromium-os:2640 Review URL: http://codereview.chromium.org/2855014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chromium_strings.grd13
-rw-r--r--chrome/app/google_chrome_strings.grd13
2 files changed, 20 insertions, 6 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 96cf50a..0d88ae2 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -283,9 +283,16 @@ be available for now. -->
<message name="IDS_OPTIONS_CHROME_UI_LANGUAGE" desc="The documentation string of the 'Chrome UI language' preference">
Chromium language:
</message>
- <message name="IDS_OPTIONS_RESTART_REQUIRED" desc="The message displayed for an option that requires a restart to take effect. This appears in a message box if an option is changed that requires a restart.">
- Please close all Chromium windows and restart Chromium for this change to take effect.
- </message>
+ <if expr="not pp_ifdef('chromeos')">
+ <message name="IDS_OPTIONS_RESTART_REQUIRED" desc="The message displayed for an option that requires a restart to take effect. This appears in a message box if an option is changed that requires a restart.">
+ Please close all Chromium windows and restart Chromium for this change to take effect.
+ </message>
+ </if>
+ <if expr="pp_ifdef('chromeos')">
+ <message name="IDS_OPTIONS_RESTART_REQUIRED" desc="The message displayed for an option that requires a restart to take effect. This appears in a message box if an option is changed that requires a restart.">
+ Please sign out of Chromium OS and sign in again for this change to take effect.
+ </message>
+ </if>
<message name="IDS_OPTIONS_RESET_MESSAGE" desc="The message shown when the user presses the 'Reset Chrome options' button">
When you reset Chromium options any changes you've made will be reverted to the default settings. Do you want to reset Chromium options?
</message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 7788383..9555a30 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -333,9 +333,16 @@ Chrome supports. -->
<message name="IDS_OPTIONS_CHROME_UI_LANGUAGE" desc="The documentation string of the 'Chrome UI language' preference">
Google Chrome language:
</message>
- <message name="IDS_OPTIONS_RESTART_REQUIRED" desc="The message displayed for an option that requires a restart to take effect. This appears in a message box if an option is changed that requires a restart.">
- Please close all Google Chrome windows and restart it for this change to take effect.
- </message>
+ <if expr="not pp_ifdef('chromeos')">
+ <message name="IDS_OPTIONS_RESTART_REQUIRED" desc="The message displayed for an option that requires a restart to take effect. This appears in a message box if an option is changed that requires a restart.">
+ Please close all Google Chrome windows and restart it for this change to take effect.
+ </message>
+ </if>
+ <if expr="pp_ifdef('chromeos')">
+ <message name="IDS_OPTIONS_RESTART_REQUIRED" desc="The message displayed for an option that requires a restart to take effect. This appears in a message box if an option is changed that requires a restart.">
+ Please sign out of Google Chrome OS and sign in again for this change to take effect.
+ </message>
+ </if>
<message name="IDS_OPTIONS_RESET_MESSAGE" desc="The message shown when the user presses the 'Reset Chrome options' button">
When you reset Google Chrome options any changes you've made will be reverted to the default settings. Do you want to reset Chrome options?
</message>