From 39cbe0a7385fbd37d7b7332a9967c7408f08175d Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Thu, 1 Dec 2011 20:48:35 +0000 Subject: 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 --- chrome/app/chromium_strings.grd | 16 +++++-- chrome/app/generated_resources.grd | 81 ++++++++++++++++++++++++++---------- chrome/app/google_chrome_strings.grd | 16 +++++-- webkit/glue/inspector_strings.grd | 15 ++++--- 4 files changed, 92 insertions(+), 36 deletions(-) diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 50b70af..b7324e5 100644 --- 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 - Chromium cannot read and write to its data directory:\n\n$1C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome +Chromium cannot read and write to its data directory: + +$1C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome Optional: Help make Chromium better by automatically sending usage statistics and crash reports to Google. - 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. - 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. - 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. diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ce1f394..a5bf53e 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -2998,7 +2998,11 @@ are declared in build/common.gypi. Subject's Public Key - Modulus ($11024 bits):\n$200 0A 38 CF ...\n\nPublic Exponent ($324 bits):\n$401 00 01 +Modulus ($11024 bits): +$200 0A 38 CF ... + +Public Exponent ($324 bits): +$401 00 01 Extensions @@ -3833,19 +3837,22 @@ are declared in build/common.gypi. Confirm Changes - The extension "$1Gmail Checker" has been installed.\n +The extension "$1Gmail Checker" has been installed. +''' - The extension "$1Gmail Checker" was automatically removed.\n +The extension "$1Gmail Checker" was automatically removed. +''' - Update checks have repeatedly failed for the extension "$1Gmail Checker."\n +Update checks have repeatedly failed for the extension "$1Gmail Checker." +''' - OK + OK - Details + Details @@ -4922,7 +4929,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Enable Instant for faster searching? - With Instant enabled and if supported by your default search engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause search results are requested even while you're typing your query, your default search engine may be logging these as search queries.\n +With Instant enabled and if supported by your default search engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search. + +Because search results are requested even while you're typing your query, your default search engine may be logging these as search queries. +''' Enable Instant for faster searching @@ -5388,7 +5398,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Plug-in Unresponsive - The following plug-in is unresponsive: $1\nShockwave\nWould you like to stop it? +The following plug-in is unresponsive: $1 +Shockwave +Would you like to stop it? Page(s) Unresponsive @@ -7844,12 +7856,16 @@ Keep your key file in a safe place. You will need it to create new versions of y Send feedback to help improve Chrome - Chrome ran out of memory.\n +Chrome ran out of memory. +''' - To hide access to this program, you need to uninstall it by using\n$1Add/Remove Programs in Control Panel.\n\nWould you like to start $1Add/Remove Programs? +To hide access to this program, you need to uninstall it by using +$1Add/Remove Programs in Control Panel. + +Would you like to start $1Add/Remove Programs? @@ -8404,7 +8420,11 @@ Keep your key file in a safe place. You will need it to create new versions of y - heuristic type: $1NAME_FIRST\nserver type: $2NAME_FIRST\nfield signature: $312345678\nform signature: $41234567812345678\nexperiment id: "$5ar1" +heuristic type: $1NAME_FIRST +server type: $2NAME_FIRST +field signature: $312345678 +form signature: $41234567812345678 +experiment id: "$5ar1" @@ -9368,7 +9388,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Do Nothing - The following application will be launched if you accept this request:\n\n $1C:\Program Files\Adobe\Reader 8.0\Reader\AcroRd32.exe /u "%1" +The following application will be launched if you accept this request: + + $1C:\Program Files\Adobe\Reader 8.0\Reader\AcroRd32.exe /u "%1" If you did not initiate this request, it may represent an attempted attack on your system. Unless you took an explicit action to initiate this request, you should press Do Nothing. @@ -9526,7 +9548,9 @@ Keep your key file in a safe place. You will need it to create new versions of y - Your profile could not be opened correctly.\n\nSome features may be unavailable. Please check that the profile exists and you have permission to read and write its contents. +Your profile could not be opened correctly. + +Some features may be unavailable. Please check that the profile exists and you have permission to read and write its contents. $1Google Chrome can not be run as root. @@ -11692,10 +11716,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Your Google Account password has changed since the last time you signed in on this computer. - Synchronize all settings and data\n(may take some time) +Synchronize all settings and data +(may take some time) - Only synchronize settings and data that have\nchanged since last sign in\n(requires your previous password) +Only synchronize settings and data that have +changed since last sign in +(requires your previous password) Previous password @@ -13045,7 +13072,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Accessibility features are enabled. - Accessibility features are enabled.\nPress Ctrl+Alt+Z to cancel. +Accessibility features are enabled. +Press Ctrl+Alt+Z to cancel. Disable Spoken Feedback @@ -13126,10 +13154,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Searching for Wi-Fi networks... - CAPS LOCK is on.\nPress both Shift keys to cancel +CAPS LOCK is on. +Press both Shift keys to cancel - CAPS LOCK is on.\nPress Search key to cancel +CAPS LOCK is on. +Press Search key to cancel Charging battery: $1100% @@ -13141,19 +13171,24 @@ Keep your key file in a safe place. You will need it to create new versions of y No battery - Charging\n$12:$230 until full +Charging +$12:$230 until full - Battery\n$12:$230 remaining +Battery +$12:$230 remaining - Charging\nCalculating time until full +Charging +Calculating time until full - Battery\nCalculating remaining time +Battery +Calculating remaining time - Charging\nBattery full +Charging +Battery full Report a bug diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index d838b5b..c9a7f01 100644 --- 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 - Google Chrome cannot read and write to its data directory:\n\n$1C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome +Google Chrome cannot read and write to its data directory: + +$1C:\Documents and Settings\devint\Local Settings\Application Data\Google\Chrome Optional: Help make Chrome OS better by automatically sending usage statistics and crash reports to Google. - 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. - 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. - 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. diff --git a/webkit/glue/inspector_strings.grd b/webkit/glue/inspector_strings.grd index 7138098..78c5584 100644 --- 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 - An error occurred trying to\nread the “%sCLIENTS” table. +An error occurred trying to +read the “%sCLIENTS” table. An unexpected error %sNo memory occurred. @@ -549,7 +550,8 @@ so we include the original license below: Domain - Don't pause on exceptions.\nClick to Pause on all exceptions. +Don't pause on exceptions. +Click to Pause on all exceptions. Double-Click to toggle between URL encoded and decoded formats @@ -864,10 +866,12 @@ so we include the original license below: Path - Pause on all exceptions.\nClick to Pause on uncaught exceptions. +Pause on all exceptions. +Click to Pause on uncaught exceptions. - Pause on uncaught exceptions.\nClick to Not pause on exceptions. +Pause on uncaught exceptions. +Click to Not pause on exceptions. Pause script execution. @@ -1158,7 +1162,8 @@ so we include the original license below: The breakpoint on line %d15 will stop only if this expression is true: - The “%sfoo”\ntable is empty. +The “%sfoo” +table is empty. This site has no cookies. -- cgit v1.1