diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 22:26:45 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 22:26:45 +0000 |
| commit | d39fcd359b3e42070040b749be64866c0129b7f9 (patch) | |
| tree | 68417da639b53268ac1a55ff894ec1a96bfd66c3 | |
| parent | 0faecc360bbd658830bf9ff6f95d97e4af5daa5a (diff) | |
| download | chromium_src-d39fcd359b3e42070040b749be64866c0129b7f9.zip chromium_src-d39fcd359b3e42070040b749be64866c0129b7f9.tar.gz chromium_src-d39fcd359b3e42070040b749be64866c0129b7f9.tar.bz2 | |
Revert "Changed crash opt-in option label to "Help make Google Chrome OS better..." on ChromeOS."
Broke compile on Windows:
first_run_search_engine_view.cc
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/google_chrome_strings.h(53) : error C2220: warning treated as error - no 'object' file generated
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/google_chrome_strings.h(53) : warning C4005: 'IDS_OPTIONS_ENABLE_LOGGING' : macro redefinition
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/chromium_strings.h(55) : see previous definition of 'IDS_OPTIONS_ENABLE_LOGGING'
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/google_chrome_strings.h(54) : warning C4005: 'IDS_OPTIONS_RESET_MESSAGE' : macro redefinition
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/chromium_strings.h(53) : see previous definition of 'IDS_OPTIONS_RESET_MESSAGE'
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/google_chrome_strings.h(55) : warning C4005: 'IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY' : macro redefinition
C:\b\slave\chromium-rel-builder\build\src\build\Release\obj\global_intermediate\chrome\grit/chromium_strings.h(54) : see previous definition of 'IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY'
TBR=zelidrag
Review URL: http://codereview.chromium.org/3111007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56251 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index b592790..b9299f7 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -337,17 +337,11 @@ Chrome supports. --> <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> - <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> - Help make Google Chrome better by automatically sending usage statistics and crash reports to Google - </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> - <message name="IDS_CROS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> - Help make Google Chrome OS better by automatically sending usage statistics and crash reports to Google - </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? @@ -355,6 +349,9 @@ Chrome supports. --> <message name="IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY" desc="Summary of problem displayed in dialog when we can't create a directory for this user."> Google Chrome cannot read and write to its data directory:\n\n<ph name="USER_DATA_DIRECTORY">$1<ex>C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome</ex></ph> </message> + <message name="IDS_OPTIONS_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> + Help make Google Chrome better by automatically sending usage statistics and crash reports to Google + </message> <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging"> <!--We use /n here to separate lines manually because NativeCheckboxGtk currently does not support multi-line. --> Optional: Help make Google Chrome better by automatically sending usage statistics and crash\nreports to Google |