| Index: chrome/app/generated_resources.grd
|
| diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
|
| index 3c53c116d60ad2b23a0cdf002b687a556c96a212..db0f34421a5bb43e83024e1864aa36aed15baa94 100644
|
| --- a/chrome/app/generated_resources.grd
|
| +++ b/chrome/app/generated_resources.grd
|
| @@ -1983,143 +1983,135 @@ Even if you have downloaded files from this website before, the website might ha
|
| </message>
|
|
|
| <!-- Download Context Menu Items -->
|
| - <if expr="not pp_ifdef('use_titlecase')">
|
| - <message name="IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE"
|
| - desc="Download context menu: Open when download is finished">
|
| - Open when &done
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_OPEN"
|
| - desc="Download context menu: Open download">
|
| - &Open
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE"
|
| - desc="Download context menu: Open when download is finished">
|
| - &Always open files of this type
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_PLATFORM_OPEN"
|
| - desc="Download context menu: Open the download using the default handler for the platform.">
|
| - Open with system viewer
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_CANCEL"
|
| - desc="Download context menu: Cancel">
|
| - &Cancel
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_PAUSE_ITEM"
|
| - desc="Download context menu: Pause download">
|
| - &Pause
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_RESUME_ITEM"
|
| - desc="Download context menu: Resume download">
|
| - &Resume
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_DISCARD"
|
| - desc="Download context menu: Discard malicious download">
|
| - &Discard
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_REPORT"
|
| - desc="Download context menu: option to upload a malicious file to Google for analysis">
|
| - &Report to Google
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_KEEP"
|
| - desc="Download context menu: Keep malicious download">
|
| - &Keep
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING"
|
| - desc="Download context menu: Show information about download scanning">
|
| - &Learn more
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_INTERRUPTED"
|
| - desc="Download context menu: Show information about interrupted downloads">
|
| - &More information
|
| - </message>
|
| - </if>
|
| - <if expr="pp_ifdef('use_titlecase')">
|
| - <message name="IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE"
|
| - desc="In Title Case: Download context menu: Open when download is finished">
|
| - Open When &Done
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_OPEN"
|
| - desc="In Title Case: Download context menu: Open download">
|
| - &Open
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE"
|
| - desc="In Title Case: Download context menu: Open when download is finished">
|
| - &Always Open Files of This Type
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_PLATFORM_OPEN"
|
| - desc="In Title Case: Download context menu: Open the download using the default handler for the platform.">
|
| - Open With System Viewer
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_CANCEL"
|
| - desc="In Title Case: Download context menu: Cancel">
|
| - &Cancel
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_PAUSE_ITEM"
|
| - desc="In Title Case: Download context menu: Pause download">
|
| - &Pause
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_RESUME_ITEM"
|
| - desc="In Title Case: Download context menu: Resume download">
|
| - &Resume
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_DISCARD"
|
| - desc="In Title Case: Download context menu: Discard malicious download">
|
| - &Discard
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_KEEP"
|
| - desc="In Title Case: Download context menu: Keep malicious download">
|
| - &Keep
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_REPORT"
|
| - desc="In Title Case: Download context menu: option to upload a malicious file to Google for analysis">
|
| - &Report to Google
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING"
|
| - desc="In Title Case: Download context menu: Show information about download scanning">
|
| - &Learn More
|
| - </message>
|
| - <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_INTERRUPTED"
|
| - desc="In Title Case: Download context menu: Show information about interrupted downloads">
|
| - &More Information
|
| - </message>
|
| - </if>
|
| - <!-- GRIT doesn't support nesting <if>...</if> blocks, so these can't -->
|
| - <!-- go within the above titlecase checks, instead markup must use -->
|
| - <!-- combined tests for all cases. -->
|
| - <!-- NOTE: the last two (OSX cases) are the same English values, -->
|
| - <!-- but two strings are needed in case some other language -->
|
| - <!-- needs a difference for Title Case support. -->
|
| - <if expr="not is_macosx and not pp_ifdef('use_titlecase')">
|
| - <!-- !Mac & Sentence case -->
|
| - <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| - desc="Show the file in file explorer, 'Show in folder' item"
|
| - meaning="'show in folder' on non Mac in Sentence case">
|
| - &Show in folder
|
| - </message>
|
| - </if>
|
| - <if expr="not is_macosx and pp_ifdef('use_titlecase')">
|
| - <!-- !Mac & Title Case -->
|
| - <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| - desc="In Title Case: Show the file in file explorer, 'Show in folder' item"
|
| - meaning="'show in folder' on non Mac in Title Case">
|
| - &Show in Folder
|
| - </message>
|
| - </if>
|
| - <if expr="is_macosx and not pp_ifdef('use_titlecase')">
|
| - <!-- Mac & Sentence case -->
|
| - <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| - desc="Mac: Show the file in the Finder, 'Show in Finder' item"
|
| - meaning="'show in Finder' on Mac in Sentence case">
|
| - &Show in Finder
|
| - </message>
|
| - </if>
|
| - <if expr="is_macosx and pp_ifdef('use_titlecase')">
|
| - <!-- Mac & Title Case -->
|
| - <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| - desc="In Title Case: Mac: Show the file in the Finder, 'Show in Finder' item"
|
| - meaning="'show in Finder' on Mac in Title Case">
|
| - &Show in Finder
|
| - </message>
|
| + <if expr="not is_android">
|
| + <if expr="not pp_ifdef('use_titlecase')">
|
| + <if expr="is_macosx">
|
| + <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| + desc="Mac: Show the file in the Finder, 'Show in Finder' item"
|
| + meaning="'show in Finder' on Mac in Sentence case">
|
| + &Show in Finder
|
| + </message>
|
| + </if>
|
| + <if expr="not is_macosx">
|
| + <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| + desc="Show the file in file explorer, 'Show in folder' item"
|
| + meaning="'show in folder' on non Mac in Sentence case">
|
| + &Show in folder
|
| + </message>
|
| + </if>
|
| + <message name="IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE"
|
| + desc="Download context menu: Open when download is finished">
|
| + Open when &done
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_OPEN"
|
| + desc="Download context menu: Open download">
|
| + &Open
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE"
|
| + desc="Download context menu: Open when download is finished">
|
| + &Always open files of this type
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_PLATFORM_OPEN"
|
| + desc="Download context menu: Open the download using the default handler for the platform.">
|
| + Open with system viewer
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_CANCEL"
|
| + desc="Download context menu: Cancel">
|
| + &Cancel
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_PAUSE_ITEM"
|
| + desc="Download context menu: Pause download">
|
| + &Pause
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_RESUME_ITEM"
|
| + desc="Download context menu: Resume download">
|
| + &Resume
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_DISCARD"
|
| + desc="Download context menu: Discard malicious download">
|
| + &Discard
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_REPORT"
|
| + desc="Download context menu: option to upload a malicious file to Google for analysis">
|
| + &Report to Google
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_KEEP"
|
| + desc="Download context menu: Keep malicious download">
|
| + &Keep
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING"
|
| + desc="Download context menu: Show information about download scanning">
|
| + &Learn more
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_INTERRUPTED"
|
| + desc="Download context menu: Show information about interrupted downloads">
|
| + &More information
|
| + </message>
|
| + </if>
|
| + <if expr="pp_ifdef('use_titlecase')">
|
| + <if expr="is_macosx">
|
| + <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| + desc="In Title Case: Mac: Show the file in the Finder, 'Show in Finder' item"
|
| + meaning="'show in Finder' on Mac in Title Case">
|
| + &Show in Finder
|
| + </message>
|
| + </if>
|
| + <if expr="not is_macosx">
|
| + <message name="IDS_DOWNLOAD_MENU_SHOW"
|
| + desc="In Title Case: Show the file in file explorer, 'Show in folder' item"
|
| + meaning="'show in folder' on non Mac in Title Case">
|
| + &Show in Folder
|
| + </message>
|
| + </if>
|
| + <message name="IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE"
|
| + desc="In Title Case: Download context menu: Open when download is finished">
|
| + Open When &Done
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_OPEN"
|
| + desc="In Title Case: Download context menu: Open download">
|
| + &Open
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE"
|
| + desc="In Title Case: Download context menu: Open when download is finished">
|
| + &Always Open Files of This Type
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_PLATFORM_OPEN"
|
| + desc="In Title Case: Download context menu: Open the download using the default handler for the platform.">
|
| + Open With System Viewer
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_CANCEL"
|
| + desc="In Title Case: Download context menu: Cancel">
|
| + &Cancel
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_PAUSE_ITEM"
|
| + desc="In Title Case: Download context menu: Pause download">
|
| + &Pause
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_RESUME_ITEM"
|
| + desc="In Title Case: Download context menu: Resume download">
|
| + &Resume
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_DISCARD"
|
| + desc="In Title Case: Download context menu: Discard malicious download">
|
| + &Discard
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_KEEP"
|
| + desc="In Title Case: Download context menu: Keep malicious download">
|
| + &Keep
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_REPORT"
|
| + desc="In Title Case: Download context menu: option to upload a malicious file to Google for analysis">
|
| + &Report to Google
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING"
|
| + desc="In Title Case: Download context menu: Show information about download scanning">
|
| + &Learn More
|
| + </message>
|
| + <message name="IDS_DOWNLOAD_MENU_LEARN_MORE_INTERRUPTED"
|
| + desc="In Title Case: Download context menu: Show information about interrupted downloads">
|
| + &More Information
|
| + </message>
|
| + </if>
|
| </if>
|
|
|
| <!-- Remove in-progress downloads confirmation dialog -->
|
|
|