Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index bf068297d25963454023a424cddc1eb16b0a2b5e..0f7ceeecd3c26d8cd8e7e3bdea48f2b3dcdd2a6c 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 |
</message> |
<message name="IDS_CERT_RSA_PUBLIC_KEY_DUMP_FORMAT" desc="Format for displaying a textual dump of an RSA public key."> |
- Modulus (<ph name="MODULUS_NUM_BITS">$1<ex>1024</ex></ph> bits):\n<ph name="MODULUS_HEX_DUMP">$2<ex>00 0A 38 CF ...</ex></ph>\n\nPublic Exponent (<ph name="PUBLIC_EXPONENT_NUM_BITS">$3<ex>24</ex></ph> bits):\n<ph name="EXPONENT_HEX_DUMP">$4<ex>01 00 01</ex></ph> |
+Modulus (<ph name="MODULUS_NUM_BITS">$1<ex>1024</ex></ph> bits): |
+<ph name="MODULUS_HEX_DUMP">$2<ex>00 0A 38 CF ...</ex></ph> |
+ |
+Public Exponent (<ph name="PUBLIC_EXPONENT_NUM_BITS">$3<ex>24</ex></ph> bits): |
+<ph name="EXPONENT_HEX_DUMP">$4<ex>01 00 01</ex></ph> |
</message> |
<message name="IDS_CERT_DETAILS_EXTENSIONS" desc="The label of the Extensions element in the details page of the certificate info dialog."> |
Extensions |
@@ -3833,19 +3837,22 @@ are declared in build/common.gypi. |
Confirm Changes |
</message> |
<message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions."> |
- The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been installed.\n |
+The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been installed. |
+''' |
</message> |
<message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED" desc="A statement that an extension has been newly blacklisted. http://www.google.com/support/chrome/bin/answer.py?hl=en&answer=1210215 contains the language on which we're basing the phrasing."> |
- The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was automatically removed.\n |
+The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was automatically removed. |
+''' |
</message> |
<message name="IDS_EXTENSION_ALERT_ITEM_ORPHANED" desc="A statement that an extension formerly live in the App Store has been delisted."> |
- Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>."\n |
+Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>." |
+''' |
</message> |
<message name="IDS_EXTENSION_ALERT_ITEM_OK" desc="The title of the default button acknowledging the information presented."> |
- OK |
+ OK |
</message> |
<message name="IDS_EXTENSION_ALERT_ITEM_DETAILS" desc="The title of the button asking for more information."> |
- Details |
+ Details |
</message> |
<!-- Extension/App install dialog strings --> |
@@ -4928,7 +4935,10 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Enable Instant for faster searching? |
</message> |
<message name="IDS_INSTANT_OPT_IN_MESSAGE" desc="Message shown in the instant opt-in dialog"> |
- 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. |
+''' |
</message> |
<message name="IDS_INSTANT_PREF" desc="Preference for enabling instant"> |
Enable Instant for faster searching |
@@ -5394,7 +5404,9 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Plug-in Unresponsive |
</message> |
<message name="IDS_BROWSER_HANGMONITOR" desc="A plugin on a page has hung"> |
- The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1\n<ex>Shockwave\n</ex></ph>Would you like to stop it? |
+The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1 |
+<ex>Shockwave |
+</ex></ph>Would you like to stop it? |
</message> |
<message name="IDS_BROWSER_HANGMONITOR_RENDERER_TITLE" desc="The title of the 'A renderer has hung' dialog"> |
Page(s) Unresponsive |
@@ -7847,12 +7859,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 |
</message> |
<message name="IDS_KILLED_TAB_FEEDBACK_MESSAGE" desc="The text to auto-populate the feedback page with."> |
- Chrome ran out of memory.\n |
+Chrome ran out of memory. |
+''' |
</message> |
<!-- Default Browser related messages --> |
<message name="IDS_HIDE_ICONS_NOT_SUPPORTED" desc="Message to explain we only support uninstall and not hide-icons."> |
- To hide access to this program, you need to uninstall it by using\n<ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph> in Control Panel.\n\nWould you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph>? |
+To hide access to this program, you need to uninstall it by using |
+<ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph> in Control Panel. |
+ |
+Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph>? |
</message> |
<if expr="pp_ifdef('chromeos')"> |
@@ -8407,7 +8423,11 @@ Keep your key file in a safe place. You will need it to create new versions of y |
</message> |
<message name="IDS_AUTOFILL_SHOW_PREDICTIONS_TITLE" desc="The title for form elements when annotated with Autofill predictions."> |
- heuristic type: <ph name="HEURISTIC_TYPE">$1<ex>NAME_FIRST</ex></ph>\nserver type: <ph name="SERVER_TYPE">$2<ex>NAME_FIRST</ex></ph>\nfield signature: <ph name="FIELD_SIGNATURE">$3<ex>12345678</ex></ph>\nform signature: <ph name="FORM_SIGNATURE">$4<ex>1234567812345678</ex></ph>\nexperiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" |
+heuristic type: <ph name="HEURISTIC_TYPE">$1<ex>NAME_FIRST</ex></ph> |
+server type: <ph name="SERVER_TYPE">$2<ex>NAME_FIRST</ex></ph> |
+field signature: <ph name="FIELD_SIGNATURE">$3<ex>12345678</ex></ph> |
+form signature: <ph name="FORM_SIGNATURE">$4<ex>1234567812345678</ex></ph> |
+experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>" |
</message> |
<message name="IDS_AUTOFILL_FEEDBACK_INFOBAR_TEXT" desc="Description text for the Autofill feedback infobar."> |
@@ -9371,7 +9391,9 @@ Keep your key file in a safe place. You will need it to create new versions of y |
Do Nothing |
</message> |
<message name="IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH" desc="Information about the application being launched by the external protocol"> |
- The following application will be launched if you accept this request:\n\n <ph name="APPLICATION">$1<ex>C:\Program Files\Adobe\Reader 8.0\Reader\AcroRd32.exe /u "%1"</ex></ph> |
+The following application will be launched if you accept this request: |
+ |
+ <ph name="APPLICATION">$1<ex>C:\Program Files\Adobe\Reader 8.0\Reader\AcroRd32.exe /u "%1"</ex></ph> |
</message> |
<message name="IDS_EXTERNAL_PROTOCOL_WARNING" desc="Warn user about external protocols."> |
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. |
@@ -9529,7 +9551,9 @@ Keep your key file in a safe place. You will need it to create new versions of y |
<!-- General app failure messages --> |
<message name="IDS_COULDNT_OPEN_PROFILE_ERROR" desc="Error displayed on startup when the profile can not be opened correctly due to problems reading or writing files in it"> |
- 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. |
</message> |
<message name="IDS_REFUSE_TO_RUN_AS_ROOT" desc="Short error message in displayed in an error dialog on startup if the user tries to run chrome as root"> |
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> can not be run as root. |
@@ -11695,10 +11719,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. |
</message> |
<message name="IDS_LOGIN_PASSWORD_CHANGED_RESET" desc="Reset option of the password changed dialog"> |
- Synchronize all settings and data\n(may take some time) |
+Synchronize all settings and data |
+(may take some time) |
</message> |
<message name="IDS_LOGIN_PASSWORD_CHANGED_MIGRATE" desc="Migrate option of the password changed dialog"> |
- 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) |
</message> |
<message name="IDS_LOGIN_PREVIOUS_PASSWORD" desc="Password field text on the password changed dialog"> |
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. |
</message> |
<message name="IDS_STATUSBAR_ACCESSIBILITY_TURNED_ON_BUBBLE" desc="The message shown on a bubble when accessibility is turned on"> |
- Accessibility features are enabled.\nPress Ctrl+Alt+Z to cancel. |
+Accessibility features are enabled. |
+Press Ctrl+Alt+Z to cancel. |
</message> |
<message name="IDS_STATUSBAR_DISABLE_SPOKEN_FEEDBACK" desc="The menu option to disable spoken feedback accessibility feature."> |
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... |
</message> |
<message name="IDS_STATUSBAR_CAPS_LOCK_ENABLED_PRESS_SHIFT_KEYS" desc="The tooltip for the caps lock indicator button."> |
- CAPS LOCK is on.\nPress both Shift keys to cancel |
+CAPS LOCK is on. |
+Press both Shift keys to cancel |
</message> |
<message name="IDS_STATUSBAR_CAPS_LOCK_ENABLED_PRESS_SEARCH" desc="The tooltip for the caps lock indicator button."> |
- CAPS LOCK is on.\nPress Search key to cancel |
+CAPS LOCK is on. |
+Press Search key to cancel |
</message> |
<message name="IDS_STATUSBAR_BATTERY_CHARGING_PERCENTAGE" desc="In the power menu button, this shows what percentage of battery is left when power supply is connected."> |
Charging battery: <ph name="PRECENTAGE">$1<ex>100</ex></ph>% |
@@ -13141,19 +13171,24 @@ Keep your key file in a safe place. You will need it to create new versions of y |
No battery |
</message> |
<message name="IDS_STATUSBAR_BATTERY_TIME_UNTIL_FULL" desc="In the power menu button, this shows how much time until fully charged."> |
- Charging\n<ph name="HOUR">$1<ex>2</ex></ph>:<ph name="MINUTE">$2<ex>30</ex></ph> until full |
+Charging |
+<ph name="HOUR">$1<ex>2</ex></ph>:<ph name="MINUTE">$2<ex>30</ex></ph> until full |
</message> |
<message name="IDS_STATUSBAR_BATTERY_TIME_UNTIL_EMPTY" desc="In the power menu button, this shows how much time until empty."> |
- Battery\n<ph name="HOUR">$1<ex>2</ex></ph>:<ph name="MINUTE">$2<ex>30</ex></ph> remaining |
+Battery |
+<ph name="HOUR">$1<ex>2</ex></ph>:<ph name="MINUTE">$2<ex>30</ex></ph> remaining |
</message> |
<message name="IDS_STATUSBAR_BATTERY_CALCULATING_TIME_UNTIL_FULL" desc="In the power menu button, this is the message the shows when we are calculating time until full."> |
- Charging\nCalculating time until full |
+Charging |
+Calculating time until full |
</message> |
<message name="IDS_STATUSBAR_BATTERY_CALCULATING_TIME_UNTIL_EMPTY" desc="In the power menu button, this is the message the shows when we are calculating time until empty."> |
- Battery\nCalculating remaining time |
+Battery |
+Calculating remaining time |
</message> |
<message name="IDS_STATUSBAR_BATTERY_IS_CHARGED" desc="In the power menu button, the battery is charged message."> |
- Charging\nBattery full |
+Charging |
+Battery full |
</message> |
<message name="IDS_STATUSBAR_FEEDBACK_TOOLTIP" desc="Tooltip for the feedback status bar icon."> |
Report a bug |