Replace \n in message strings to acutal new lines.

I had added a hack in http://codereview.chromium.org/196007 to mimic a behavior of how rc.exe replaces \n with a newline. Unfortunately, this didn't make it possible to have legitimate uses of \n in a string. Instead, remove all occurrences of \n in preparation of removing this hack. BUG=105985 Review URL: http://codereview.chromium.org/8757009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112526 0039d316-1c4b-4281-b951-d872f2087c98

Replace \n in message strings to acutal new lines.
I had added a hack in http://codereview.chromium.org/196007 to mimic a behavior of how rc.exe replaces \n with a newline. Unfortunately, this didn't make it possible to have legitimate uses of \n in a string. Instead, remove all occurrences of \n in preparation of removing this hack. BUG=105985 Review URL: http://codereview.chromium.org/8757009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112526 0039d316-1c4b-4281-b951-d872f2087c98
39cbe0a7 · tony@chromium.org · 9effe6e6 · 39cbe0a7 · 39cbe0a7 · 39cbe0a7
Commit 39cbe0a7 authored Dec 01, 2011 by tony@chromium.org
4 changed files
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -333,19 +333,27 @@ be available for now. -->
        Continue running background apps when Chromium is closed
      </message>
      <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.">
-        Chromium 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>
+Chromium cannot read and write to its data directory:
+
+<ph name="USER_DATA_DIRECTORY">$1<ex>C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome</ex></ph>
      </message>
      <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
        Optional: Help make Chromium better by automatically sending usage statistics and crash reports to Google.
      </message>
      <message name="IDS_PROFILE_TOO_NEW_ERROR" desc="Error displayed on startup when the profile is from a newer version of the product and can not be read">
-        Your profile can not be used because it is from a newer version of Chromium.\n\nSome features may be unavailable. Please specify a different profile directory or use a newer version of Chromium.
+Your profile can not be used because it is from a newer version of Chromium.
+
+Some features may be unavailable. Please specify a different profile directory or use a newer version of Chromium.
      </message>
      <message name="IDS_PREFERENCES_UNREADABLE_ERROR" desc="Error displayed on startup when user preferences file can not be read">
-        Your preferences can not be read.\n\nSome features may be unavailable and changes to preferences won't be saved.
+Your preferences can not be read.
+
+Some features may be unavailable and changes to preferences won't be saved.
      </message>
      <message name="IDS_PREFERENCES_CORRUPT_ERROR" desc="Error displayed on startup when user preferences file can not be read">
-        Your preferences file is corrupt or invalid.\n\nChromium is unable to recover your settings.
+Your preferences file is corrupt or invalid.
+
+Chromium is unable to recover your settings.
      </message>
      <!-- Crash Recovery Dialog -->
      <message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes.">

--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -307,19 +307,27 @@ Chrome supports. -->
        Continue running background apps when Google Chrome is closed
      </message>
      <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>
+Google Chrome cannot read and write to its data directory:
+
+<ph name="USER_DATA_DIRECTORY">$1<ex>C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome</ex></ph>
      </message>
      <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging on EULA screen.">
        Optional: Help make Chrome OS better by automatically sending usage statistics and crash reports to Google.
      </message>
      <message name="IDS_PROFILE_TOO_NEW_ERROR" desc="Error displayed on startup when the profile is from a newer version of the product and can not be read">
-        Your profile can not be used because it is from a newer version of Google Chrome.\n\nSome features may be unavailable. Please specify a different profile directory or use a newer version of Chrome.
+Your profile can not be used because it is from a newer version of Google Chrome.
+
+Some features may be unavailable. Please specify a different profile directory or use a newer version of Chrome.
      </message>
      <message name="IDS_PREFERENCES_UNREADABLE_ERROR" desc="Error displayed on startup when user preferences file can not be read">
-        Your preferences can not be read.\n\nSome features may be unavailable and changes to preferences won't be saved.
+Your preferences can not be read.
+
+Some features may be unavailable and changes to preferences won't be saved.
      </message>
      <message name="IDS_PREFERENCES_CORRUPT_ERROR" desc="Error displayed on startup when user preferences file can not be read">
-        Your preferences file is corrupt or invalid.\n\nGoogle Chrome is unable to recover your settings.
+Your preferences file is corrupt or invalid.
+
+Google Chrome is unable to recover your settings.
      </message>
      <!-- Crash Recovery Dialog -->
      <message name="IDS_CRASH_RECOVERY_TITLE" desc="Title of dialog shown when the browser crashes.">

--- a/webkit/glue/inspector_strings.grd
+++ b/webkit/glue/inspector_strings.grd
@@ -378,7 +378,8 @@ so we include the original license below:
        Always enable
      </message>
      <message name="IDS_ERROR_MESSAGE_DISPLAYED_ON_FAILURE_TO_READ_A_DATABASE_TABLE" desc="Error message displayed on failure to read a database table.">
-        An error occurred trying to\nread the “<ph name="TABLE_NAME">%s<ex>CLIENTS</ex></ph>” table.
+An error occurred trying to
+read the “<ph name="TABLE_NAME">%s<ex>CLIENTS</ex></ph>” table.
      </message>
      <message name="IDS_ERROR_MESSAGE_DISPLAYED_WHEN_AN_UNEXPECTED_ERROR_OCCURS_DURING_DATABASE_QUERY" desc="Error message displayed when an unexpected error occurs during database query.">
        An unexpected error <ph name="ERROR">%s<ex>No memory</ex></ph> occurred.
@@ -549,7 +550,8 @@ so we include the original license below:
        Domain
      </message>
      <message name="IDS_NO_PAUSE_ON_EXCEPTIONS" desc="The current state: don't pause on exception, after LF: a hint for a button that changes the state.">
-        Don't pause on exceptions.\nClick to Pause on all exceptions.
+Don't pause on exceptions.
+Click to Pause on all exceptions.
      </message>
      <message name="IDS_TOGGLE_URL_FORMAT" desc="A hint on how to toggle between URL formats.">
        Double-Click to toggle between URL encoded and decoded formats
@@ -864,10 +866,12 @@ so we include the original license below:
        Path
      </message>
      <message name="IDS_PAUSE_ON_ALL_EXCEPTIONS" desc="Current state: pause on all exceptions. After the \n separator: a hint on how to switch the state.">
-        Pause on all exceptions.\nClick to Pause on uncaught exceptions.
+Pause on all exceptions.
+Click to Pause on uncaught exceptions.
      </message>
      <message name="IDS_PAUSE_ON_UNHANDLED_EXCEPTIONS" desc="Current state: pause on unhandled exceptions. After the \n separator: a hint on how to switch the state.">
-        Pause on uncaught exceptions.\nClick to Not pause on exceptions.
+Pause on uncaught exceptions.
+Click to Not pause on exceptions.
      </message>
      <message name="IDS_HINT_FOR_A_BUTTON_THAT_PAUSES_SCRIPT_EXECUTION" desc="Hint for a button that pauses script execution.">
        Pause script execution.
@@ -1158,7 +1162,8 @@ so we include the original license below:
        The breakpoint on line <ph name="LINE_NUMBER">%d<ex>15</ex></ph> will stop only if this expression is true:
      </message>
      <message name="IDS_MESSAGE_INDICATING_THAT_DATABASE_TABLE_IS_EMPTY" desc="Message indicating that database table is empty.">
-        The “<ph name="TABLE_NAME">%s<ex>foo</ex></ph>”\ntable is empty.
+The “<ph name="TABLE_NAME">%s<ex>foo</ex></ph>”
+table is empty.
      </message>
      <message name="IDS_MESSAGE_INDICATING_THAT_CURRENT_SITE_DOES_NOT_HAVE_COOKIES" desc="Message indicating that current site doesn't have cookies.">
        This site has no cookies.