| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index f08609321fcf5cdef56ffba2a86dbc2f582b8926..1dd635718c70d59cc7e13903768e2a790cf484b1 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -4905,21 +4905,31 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| <message name="IDS_EXTERNAL_PROTOCOL_TITLE" desc="External Protocol Dialog Title">
|
| External Protocol Request
|
| </message>
|
| - <message name="IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT" desc="Button in External Protocol Dialog that launches the application associated with the protocol">
|
| - Launch Application
|
| - </message>
|
| - <message name="IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT" desc="Button in External Protocol Dialog that cancels the application launch">
|
| - 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>
|
| - </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 Cancel.
|
| - </message>
|
| - <message name="IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT" desc="Checkbox to remember users decision.">
|
| - Remember my choice for all links of this type.
|
| - </message>
|
| + <if expr="not pp_ifdef('chromeos')">
|
| + <message name="IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT" desc="Button in External Protocol Dialog that launches the application associated with the protocol">
|
| + Launch Application
|
| + </message>
|
| + <message name="IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT" desc="Button in External Protocol Dialog that cancels the application launch">
|
| + 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>
|
| + </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 Cancel.
|
| + </message>
|
| + <message name="IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT" desc="Checkbox to remember users decision.">
|
| + Remember my choice for all links of this type.
|
| + </message>
|
| + </if>
|
| + <if expr="pp_ifdef('chromeos')">
|
| + <message name="IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT" desc="Button in External Protocol Dialog that closes the dialog">
|
| + Close
|
| + </message>
|
| + <message name="IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT" desc="Checkbox to remember users decision.">
|
| + Never show the dialog again for all links of this type.
|
| + </message>
|
| + </if>
|
|
|
| <!-- Shortcut Modifiers -->
|
| <message name="IDS_CONTROL_MODIFIER" desc="Control key shortcut modifier">
|
| @@ -5747,7 +5757,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
| </if>
|
|
|
| <!-- Chrome OS Strings -->
|
| - <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
|
| + <if expr="pp_ifdef('chromeos')">
|
| <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME">
|
| Date and Time
|
| </message>
|
|
|